ahoy_matey 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40291bf283651d14352010eda0c253cebed87db6
-  data.tar.gz: 0ecfe15d70e6be8c3d4078b7148049edad546401
+  metadata.gz: cb1cce9c5947f97e0a19216e9427447c769c580d
+  data.tar.gz: 736da048bedafb0038ae932c1f76993941d6e95a
 SHA512:
-  metadata.gz: bdc0d68f6ef24f2da215fa89a1b0a0a1dcb44b2a85e09eea078c2dc95d2705b776e0dda75e962563261bd7029a1ed28587128ea63129865045ba21fa53929fe9
-  data.tar.gz: ecd7f16f4c533da8970adc20dae85fdcebb661be1d87872b269ddc7b53ad453ff3b5f72a1f82bc1888f29f77ed390d4e27a21715545f17d7e15c3d51d256ff71
+  metadata.gz: c05c1549e95925259447087b65a03351f29b82d99a47790e799f075bfceddafb49d5c20b5f4f20f0f5ac2469739749c56aec74dfa96b7a1f3a5d887a2091a79c
+  data.tar.gz: 62ee3cb9f38fdf312b7992bbb41df8ca5341f43743e308973ac71f57ad97a91d5c9225ee0364b165d6886da28613cce2125fc25a46014564e341ac5d41e3e70f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.2.0
+
+- Added support for PostgreSQL `jsonb` column type
+- Added Fluentd store
+- Added latitude, longitude, and postal_code to visits
+- Log exclusions
+
 ## 1.1.1
 
 - Better support for Authlogic

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in ahoy.gemspec
 gemspec

data/README.md

@@ -1,12 +1,14 @@
 # Ahoy
 
+:fire: Never build an analytics platform from scratch again.
+
 Ahoy provides a solid foundation to track visits and events in Ruby, JavaScript, and native apps.
 
-:fire: Works with any data store so you can easily scale.
+Works with any data store so you can easily scale.
 
-:postbox: To track emails, check out [Ahoy Email](https://github.com/ankane/ahoy_email).
+:tangerine: Battle-tested at [Instacart](https://www.instacart.com/opensource)
 
-Never build an analytics platform from scratch again.
+: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.
 
@@ -27,9 +29,26 @@ And add the javascript file in `app/assets/javascripts/application.js` after jQu
 
 ## Choose a Data Store
 
+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
 
-For Rails 4 and PostgreSQL 9.2 or greater, use:
+For Rails 4 and PostgreSQL 9.4 or greater, use:
+
+```sh
+rails generate ahoy:stores:active_record -d postgresql-jsonb
+rake db:migrate
+```
+
+For Rails 4 and PostgreSQL 9.2 and 9.3, use:
 
 ```sh
 rails generate ahoy:stores:active_record -d postgresql
@@ -60,12 +79,28 @@ rails generate ahoy:stores:active_record_visits
 rake db:migrate
 ```
 
-### Mongoid
+### MongoDB
 
 ```sh
 rails generate ahoy:stores:mongoid
 ```
 
+### Fluentd
+
+Add [fluent-logger](https://github.com/fluent/fluent-logger-ruby) to your Gemfile.
+
+```ruby
+gem 'fluent-logger'
+```
+
+And run:
+
+```sh
+rails generate ahoy:stores:fluentd
+```
+
+Use `ENV["FLUENTD_HOST"]` and `ENV["FLUENTD_PORT"]` to configure.
+
 ### Logs
 
 ```sh
@@ -297,7 +332,7 @@ Ahoy.visit_duration = 30.minutes
 
 ### ActiveRecord
 
-Let’s associate orders with visits.
+Let’s associate orders with visits. Add a `visit_id` column on orders and do:
 
 ```ruby
 class Order < ActiveRecord::Base
@@ -584,7 +619,8 @@ end
 
 ## TODO
 
-- simple dashboard
+- real-time dashboard of visits and events
+- more events for append only stores
 - turn off modules
 
 ## No Ruby?

data/Rakefile

@@ -1,7 +1,7 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-task :default => :test
+task default: :test
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.pattern = "test/**/*_test.rb"

data/ahoy_matey.gemspec

@@ -1,15 +1,15 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ahoy/version'
+require "ahoy/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "ahoy_matey"
   spec.version       = Ahoy::VERSION
   spec.authors       = ["Andrew Kane"]
   spec.email         = ["andrew@chartkick.com"]
-  spec.summary       = %q{Simple, powerful visit tracking for Rails}
-  spec.description   = %q{Simple, powerful visit tracking for Rails}
+  spec.summary       = "Simple, powerful visit tracking for Rails"
+  spec.description   = "Simple, powerful visit tracking for Rails"
   spec.homepage      = "https://github.com/ankane/ahoy"
   spec.license       = "MIT"
 

data/app/controllers/ahoy/base_controller.rb

@@ -6,6 +6,5 @@ module Ahoy
     def ahoy
       @ahoy ||= Ahoy::Tracker.new(controller: self, api: true)
     end
-
   end
 end

data/app/controllers/ahoy/events_controller.rb

@@ -1,6 +1,5 @@
 module Ahoy
   class EventsController < Ahoy::BaseController
-
     def create
       events =
         if params[:name]
@@ -29,6 +28,5 @@ module Ahoy
       end
       render json: {}
     end
-
   end
 end

data/app/controllers/ahoy/visits_controller.rb

@@ -1,10 +1,8 @@
 module Ahoy
   class VisitsController < BaseController
-
     def create
       ahoy.track_visit
       render json: {visit_id: ahoy.visit_id, visitor_id: ahoy.visitor_id}
     end
-
   end
 end

data/lib/ahoy.rb

@@ -22,7 +22,9 @@ require "ahoy/stores/base_store"
 require "ahoy/stores/active_record_store"
 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)
 
@@ -82,3 +84,10 @@ end
 
 ActionController::Base.send :include, Ahoy::Controller
 ActiveRecord::Base.send(:extend, Ahoy::Model) if defined?(ActiveRecord)
+
+Logger.send :include, Ahoy::LoggerSilencer
+
+begin
+  require "syslog/logger"
+  Syslog::Logger.send :include, Ahoy::LoggerSilencer
+rescue LoadError; end

data/lib/ahoy/controller.rb

@@ -2,7 +2,6 @@ require "request_store"
 
 module Ahoy
   module Controller
-
     def self.included(base)
       base.helper_method :current_visit
       base.helper_method :ahoy
@@ -31,6 +30,5 @@ module Ahoy
         ahoy.track_visit(defer: !Ahoy.track_visits_immediately)
       end
     end
-
   end
 end

data/lib/ahoy/deckhands/location_deckhand.rb

@@ -1,7 +1,6 @@
 module Ahoy
   module Deckhands
     class LocationDeckhand
-
       def initialize(ip)
         @ip = ip
       end
@@ -14,14 +13,26 @@ module Ahoy
         location.try(:state).presence
       end
 
+      def postal_code
+        location.try(:postal_code).presence
+      end
+
       def city
         location.try(:city).presence
       end
 
+      def latitude
+        location.try(:latitude).presence
+      end
+
+      def longitude
+        location.try(:longitude).presence
+      end
+
       protected
 
       def location
-        if !@checked
+        unless @checked
           @location =
             begin
               Geocoder.search(@ip).first
@@ -33,7 +44,6 @@ module Ahoy
         end
         @location
       end
-
     end
   end
 end

data/lib/ahoy/deckhands/request_deckhand.rb

@@ -43,7 +43,6 @@ module Ahoy
       def screen_width
         request.params["screen_width"]
       end
-
     end
   end
 end

data/lib/ahoy/deckhands/technology_deckhand.rb

@@ -1,7 +1,6 @@
 module Ahoy
   module Deckhands
     class TechnologyDeckhand
-
       def initialize(user_agent)
         @user_agent = user_agent
       end
@@ -43,7 +42,6 @@ module Ahoy
       def self.user_agent_parser
         @user_agent_parser ||= UserAgentParser::Parser.new
       end
-
     end
   end
 end

data/lib/ahoy/deckhands/traffic_source_deckhand.rb

@@ -1,7 +1,6 @@
 module Ahoy
   module Deckhands
     class TrafficSourceDeckhand
-
       def initialize(referrer)
         @referrer = referrer
       end
@@ -18,7 +17,6 @@ module Ahoy
       def self.referrer_parser
         @referrer_parser ||= RefererParser::Parser.new
       end
-
     end
   end
 end

data/lib/ahoy/deckhands/utm_parameter_deckhand.rb

@@ -1,7 +1,6 @@
 module Ahoy
   module Deckhands
     class UtmParameterDeckhand
-
       def initialize(landing_page)
         @landing_page = landing_page
       end
@@ -13,12 +12,11 @@ module Ahoy
         end
       end
 
-      %w[utm_source utm_medium utm_term utm_content utm_campaign].each do |name|
+      %w(utm_source utm_medium utm_term utm_content utm_campaign).each do |name|
         define_method name do
           landing_params[name]
         end
       end
-
     end
   end
 end

data/lib/ahoy/engine.rb

@@ -1,30 +1,25 @@
 module Ahoy
   class Engine < ::Rails::Engine
-
     # from https://github.com/evrone/quiet_assets/blob/master/lib/quiet_assets.rb
-    initializer "ahoy.middleware", after: "sprockets.environment" do |app|
+    initializer "ahoy.middleware", after: "sprockets.environment" do
       next unless Ahoy.quiet
 
       # Parse PATH_INFO by assets prefix
-      AHOY_PREFIX = "/ahoy/"
-      KEY = "ahoy.old_level"
+      AHOY_PREFIX = "/ahoy/".freeze
 
       # Just create an alias for call in middleware
       Rails::Rack::Logger.class_eval do
         def call_with_quiet_ahoy(env)
-          begin
-            if env["PATH_INFO"].start_with?(AHOY_PREFIX)
-              env[KEY] = Rails.logger.level
-              Rails.logger.level = Logger::ERROR
+          if env["PATH_INFO"].start_with?(AHOY_PREFIX) && logger.respond_to?(:silence_logger)
+            logger.silence_logger do
+              call_without_quiet_ahoy(env)
             end
+          else
             call_without_quiet_ahoy(env)
-          ensure
-            Rails.logger.level = env[KEY] if env[KEY]
           end
         end
         alias_method_chain :call, :quiet_ahoy
       end
     end
-
   end
 end

data/lib/ahoy/geocode_job.rb

@@ -9,6 +9,5 @@ module Ahoy
       end
       visit.save!
     end
-
   end
 end

data/lib/ahoy/logger_silencer.rb

@@ -0,0 +1,73 @@
+# from https://github.com/rails/activerecord-session_store/blob/master/lib/active_record/session_store/extension/logger_silencer.rb
+require "thread"
+require "active_support/core_ext/class/attribute_accessors"
+require "active_support/core_ext/module/aliasing"
+require "active_support/core_ext/module/attribute_accessors"
+require "active_support/concern"
+
+module Ahoy
+  module LoggerSilencer
+    extend ActiveSupport::Concern
+
+    included do
+      cattr_accessor :silencer
+      self.silencer = true
+      alias_method_chain :level, :threadsafety
+      alias_method_chain :add, :threadsafety
+    end
+
+    def thread_level
+      Thread.current[thread_hash_level_key]
+    end
+
+    def thread_level=(level)
+      Thread.current[thread_hash_level_key] = level
+    end
+
+    def level_with_threadsafety
+      thread_level || level_without_threadsafety
+    end
+
+    def add_with_threadsafety(severity, message = nil, progname = nil, &block)
+      if !defined?(@logdev) || @logdev.nil? || (severity || UNKNOWN) < level
+        true
+      else
+        add_without_threadsafety(severity, message, progname, &block)
+      end
+    end
+
+    # Silences the logger for the duration of the block.
+    def silence_logger(temporary_level = Logger::ERROR)
+      if silencer
+        begin
+          self.thread_level = temporary_level
+          yield self
+        ensure
+          self.thread_level = nil
+        end
+      else
+        yield self
+      end
+    end
+
+    for severity in Logger::Severity.constants
+      class_eval <<-EOT, __FILE__, __LINE__ + 1
+        def #{severity.downcase}?                # def debug?
+          Logger::#{severity} >= level           #   DEBUG >= level
+        end                                      # end
+      EOT
+    end
+
+    private
+
+    def thread_hash_level_key
+      @thread_hash_level_key ||= :"ThreadSafeLogger##{object_id}@level"
+    end
+  end
+end
+
+class NilLogger
+  def self.silence_logger
+    yield
+  end
+end

data/lib/ahoy/model.rb

@@ -1,6 +1,5 @@
 module Ahoy
   module Model
-
     def visitable(name = nil, options = {})
       if name.is_a?(Hash)
         name = nil
@@ -11,7 +10,7 @@ module Ahoy
         belongs_to name, options
         before_create :set_visit
       end
-      class_eval %Q{
+      class_eval %{
         def set_visit
           self.#{name} ||= RequestStore.store[:ahoy].try(:visit)
         end
@@ -32,9 +31,7 @@ module Ahoy
             Deckhands::UtmParameterDeckhand.new(landing_page).landing_params
           end
         end
-
       end
     end
-
   end
 end

data/lib/ahoy/stores/active_record_store.rb

@@ -1,7 +1,6 @@
 module Ahoy
   module Stores
     class ActiveRecordStore < BaseStore
-
       def track_visit(options, &block)
         visit =
           visit_model.new do |v|
@@ -28,7 +27,7 @@ module Ahoy
           event_model.new do |e|
             e.id = options[:id]
             e.visit_id = ahoy.visit_id
-            e.user = user
+            e.user = user if e.respond_to?(:user=)
             e.name = name
             e.properties = properties
             e.time = options[:time]
@@ -56,7 +55,6 @@ module Ahoy
       def event_model
         ::Ahoy::Event
       end
-
     end
   end
 end

data/lib/ahoy/stores/active_record_token_store.rb

@@ -1,7 +1,6 @@
 module Ahoy
   module Stores
     class ActiveRecordTokenStore < BaseStore
-
       def track_visit(options, &block)
         visit =
           visit_model.new do |v|
@@ -61,18 +60,18 @@ module Ahoy
 
       def exclude?
         (!Ahoy.track_bots && bot?) ||
-        (
-          if Ahoy.exclude_method
-            warn "[DEPRECATION] Ahoy.exclude_method is deprecated - use exclude? instead"
-            if Ahoy.exclude_method.arity == 1
-              Ahoy.exclude_method.call(controller)
+          (
+            if Ahoy.exclude_method
+              warn "[DEPRECATION] Ahoy.exclude_method is deprecated - use exclude? instead"
+              if Ahoy.exclude_method.arity == 1
+                Ahoy.exclude_method.call(controller)
+              else
+                Ahoy.exclude_method.call(controller, request)
+              end
             else
-              Ahoy.exclude_method.call(controller, request)
+              false
             end
-          else
-            false
-          end
-        )
+          )
       end
 
       def user
@@ -89,7 +88,6 @@ module Ahoy
       end
 
       class << self
-
         def uses_deprecated_subscribers
           warn "[DEPRECATION] Ahoy subscribers are deprecated"
           @uses_deprecated_subscribers = true
@@ -98,7 +96,6 @@ module Ahoy
         def uses_deprecated_subscribers?
           @uses_deprecated_subscribers || false
         end
-
       end
 
       protected
@@ -110,7 +107,6 @@ module Ahoy
       def event_model
         ::Ahoy::Event
       end
-
     end
   end
 end

data/lib/ahoy/stores/base_store.rb

@@ -1,7 +1,6 @@
 module Ahoy
   module Stores
     class BaseStore
-
       def initialize(options)
         @options = options
       end
@@ -17,7 +16,7 @@ module Ahoy
 
       def authenticate(user)
         @user = user
-        if visit and visit.respond_to?(:user) and !visit.user
+        if visit && visit.respond_to?(:user) && !visit.user
           begin
             visit.user = user
             visit.save!
@@ -84,7 +83,6 @@ module Ahoy
         classes << PG::UniqueViolation if defined?(PG::UniqueViolation)
         classes
       end
-
     end
   end
 end

data/lib/ahoy/stores/fluentd_store.rb

@@ -0,0 +1,17 @@
+module Ahoy
+  module Stores
+    class FluentdStore < LogStore
+      def log_visit(data)
+        logger.post("visit", data)
+      end
+
+      def log_event(data)
+        logger.post("event", data)
+      end
+
+      def logger
+        @logger ||= Fluent::Logger::FluentLogger.new("ahoy", host: ENV["FLUENTD_HOST"] || "localhost", port: ENV["FLUENTD_PORT"] || 24224)
+      end
+    end
+  end
+end

data/lib/ahoy/stores/log_store.rb

@@ -1,18 +1,17 @@
 module Ahoy
   module Stores
     class LogStore < BaseStore
-
       def track_visit(options, &block)
         data = {
           id: ahoy.visit_id,
-          visitor_id: ahoy.visitor_id,
+          visitor_id: ahoy.visitor_id
         }.merge(visit_properties.to_hash)
         data[:user_id] = user.id if user
         data[:started_at] = options[:started_at]
 
         yield(data) if block_given?
 
-        visit_logger.info data.to_json
+        log_visit(data)
       end
 
       def track_event(name, properties, options, &block)
@@ -28,11 +27,19 @@ module Ahoy
 
         yield(data) if block_given?
 
-        event_logger.info data.to_json
+        log_event(data)
       end
 
       protected
 
+      def log_visit(data)
+        visit_logger.info data.to_json
+      end
+
+      def log_event(data)
+        event_logger.info data.to_json
+      end
+
       # TODO disable header
       def visit_logger
         @visit_logger ||= ActiveSupport::Logger.new(Rails.root.join("log/visits.log"))
@@ -41,7 +48,6 @@ module Ahoy
       def event_logger
         @event_logger ||= ActiveSupport::Logger.new(Rails.root.join("log/events.log"))
       end
-
     end
   end
 end

data/lib/ahoy/stores/mongoid_store.rb

@@ -1,7 +1,6 @@
 module Ahoy
   module Stores
     class MongoidStore < BaseStore
-
       def track_visit(options, &block)
         visit =
           visit_model.new do |v|
@@ -59,7 +58,6 @@ module Ahoy
           token
         end
       end
-
     end
   end
 end

data/lib/ahoy/subscribers/active_record.rb

@@ -1,7 +1,6 @@
 module Ahoy
   module Subscribers
     class ActiveRecord
-
       def initialize(options = {})
         @model = options[:model] || Ahoy::Event
       end
@@ -15,7 +14,6 @@ module Ahoy
           e.time = options[:time]
         end
       end
-
     end
   end
 end

data/lib/ahoy/tracker.rb

@@ -10,7 +10,9 @@ module Ahoy
     end
 
     def track(name, properties = {}, options = {})
-      unless exclude?
+      if exclude?
+        debug "Event excluded"
+      else
         options = options.dup
 
         options[:time] = trusted_time(options[:time])
@@ -24,7 +26,9 @@ module Ahoy
     end
 
     def track_visit(options = {})
-      unless exclude?
+      if exclude?
+        debug "Visit excluded"
+      else
         if options[:defer]
           set_cookie("ahoy_track", true)
         else
@@ -41,7 +45,9 @@ module Ahoy
     end
 
     def authenticate(user)
-      unless exclude?
+      if exclude?
+        debug "Authentication excluded"
+      else
         @store.authenticate(user)
       end
       true
@@ -70,7 +76,7 @@ module Ahoy
     end
 
     def set_visitor_cookie
-      if !existing_visitor_id
+      unless existing_visitor_id
         set_cookie("ahoy_visitor", visitor_id, Ahoy.visitor_duration)
       end
     end
@@ -107,7 +113,7 @@ module Ahoy
     end
 
     def trusted_time(time)
-      if !time or (@options[:api] and !(1.minute.ago..Time.now).cover?(time))
+      if !time || (@options[:api] && !(1.minute.ago..Time.now).cover?(time))
         Time.zone.now
       else
         time
@@ -146,5 +152,8 @@ module Ahoy
       Ahoy.ensure_uuid(id)
     end
 
+    def debug(message)
+      Rails.logger.debug { "[ahoy] #{message}" }
+    end
   end
 end

data/lib/ahoy/version.rb

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

data/lib/ahoy/visit_properties.rb

@@ -1,11 +1,10 @@
 module Ahoy
   class VisitProperties
-
     REQUEST_KEYS = [:ip, :user_agent, :referrer, :landing_page, :platform, :app_version, :os_version, :screen_height, :screen_width]
     TRAFFIC_SOURCE_KEYS = [:referring_domain, :search_keyword]
     UTM_PARAMETER_KEYS = [:utm_source, :utm_medium, :utm_term, :utm_content, :utm_campaign]
     TECHNOLOGY_KEYS = [:browser, :os, :device_type]
-    LOCATION_KEYS = [:country, :region, :city]
+    LOCATION_KEYS = [:country, :region, :city, :postal_code, :latitude, :longitude]
 
     KEYS = REQUEST_KEYS + TRAFFIC_SOURCE_KEYS + UTM_PARAMETER_KEYS + TECHNOLOGY_KEYS + LOCATION_KEYS
 
@@ -33,7 +32,7 @@ module Ahoy
     end
 
     def to_hash
-      keys.inject({}){|memo, key| memo[key] = send(key); memo }
+      keys.inject({}) { |memo, key| memo[key] = send(key); memo }
     end
 
     protected
@@ -57,6 +56,5 @@ module Ahoy
     def location_deckhand
       @location_deckhand ||= Deckhands::LocationDeckhand.new(request_deckhand.ip)
     end
-
   end
 end

data/lib/ahoy/warden.rb

@@ -1,4 +1,4 @@
-Warden::Manager.after_set_user except: :fetch do |user, auth, opts|
+Warden::Manager.after_set_user except: :fetch do |user, auth, _|
   request = ActionDispatch::Request.new(auth.env)
   ahoy = Ahoy::Tracker.new(request: request)
   ahoy.authenticate(user)

data/lib/generators/ahoy/stores/active_record_events_generator.rb

@@ -24,7 +24,7 @@ module Ahoy
         end
 
         def copy_migration
-          unless options["database"].in?([nil, "postgresql"])
+          unless options["database"].in?([nil, "postgresql", "postgresql-jsonb"])
             raise Thor::Error, "Unknown database option"
           end
           migration_template "active_record_events_migration.rb", "db/migrate/create_ahoy_events.rb"
@@ -37,7 +37,6 @@ module Ahoy
         def create_initializer
           template "active_record_initializer.rb", "config/initializers/ahoy.rb"
         end
-
       end
     end
   end

data/lib/generators/ahoy/stores/active_record_generator.rb

@@ -10,7 +10,6 @@ module Ahoy
           invoke "ahoy:stores:active_record_visits", nil, options
           invoke "ahoy:stores:active_record_events", nil, options
         end
-
       end
     end
   end

data/lib/generators/ahoy/stores/active_record_visits_generator.rb

@@ -24,7 +24,7 @@ module Ahoy
         end
 
         def copy_migration
-          unless options["database"].in?([nil, "postgresql"])
+          unless options["database"].in?([nil, "postgresql", "postgresql-jsonb"])
             raise Thor::Error, "Unknown database option"
           end
           migration_template "active_record_visits_migration.rb", "db/migrate/create_visits.rb"
@@ -37,7 +37,6 @@ module Ahoy
         def create_initializer
           template "active_record_initializer.rb", "config/initializers/ahoy.rb"
         end
-
       end
     end
   end

data/lib/generators/ahoy/stores/custom_generator.rb

@@ -9,7 +9,6 @@ module Ahoy
         def create_initializer
           template "custom_initializer.rb", "config/initializers/ahoy.rb"
         end
-
       end
     end
   end

data/lib/generators/ahoy/stores/fluentd_generator.rb

@@ -0,0 +1,15 @@
+require "rails/generators"
+
+module Ahoy
+  module Stores
+    module Generators
+      class FluentdGenerator < Rails::Generators::Base
+        source_root File.expand_path("../templates", __FILE__)
+
+        def create_initializer
+          template "fluentd_initializer.rb", "config/initializers/ahoy.rb"
+        end
+      end
+    end
+  end
+end

data/lib/generators/ahoy/stores/log_generator.rb

@@ -9,7 +9,6 @@ module Ahoy
         def create_initializer
           template "log_initializer.rb", "config/initializers/ahoy.rb"
         end
-
       end
     end
   end

data/lib/generators/ahoy/stores/mongoid_events_generator.rb

@@ -13,7 +13,6 @@ module Ahoy
         def create_initializer
           template "mongoid_initializer.rb", "config/initializers/ahoy.rb"
         end
-
       end
     end
   end

data/lib/generators/ahoy/stores/mongoid_generator.rb

@@ -4,12 +4,10 @@ module Ahoy
   module Stores
     module Generators
       class MongoidGenerator < Rails::Generators::Base
-
         def boom
           invoke "ahoy:stores:mongoid_visits"
           invoke "ahoy:stores:mongoid_events"
         end
-
       end
     end
   end

data/lib/generators/ahoy/stores/mongoid_visits_generator.rb

@@ -21,7 +21,6 @@ module Ahoy
         def create_initializer
           template "mongoid_initializer.rb", "config/initializers/ahoy.rb"
         end
-
       end
     end
   end

data/lib/generators/ahoy/stores/templates/active_record_event_model.rb

@@ -3,7 +3,7 @@ module Ahoy
     self.table_name = "ahoy_events"
 
     belongs_to :visit
-    belongs_to :user<% if options["database"] != "postgresql" %>
+    belongs_to :user<% if options["database"].blank? %>
 
     serialize :properties, JSON<% end %>
   end

data/lib/generators/ahoy/stores/templates/active_record_events_migration.rb

@@ -1,15 +1,15 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   def change
     create_table :ahoy_events, id: false do |t|
-      t.uuid :id, primary_key: true
-      t.uuid :visit_id
+      t.uuid :id, default: nil, primary_key: true
+      t.uuid :visit_id, default: nil
 
       # user
       t.integer :user_id
       # add t.string :user_type if polymorphic
 
       t.string :name
-      t.<% if options["database"] == "postgresql" %>json<% else %>text<% end %> :properties
+      t.<% case options["database"] when "postgresql" %>json<% when "postgresql-jsonb" %>jsonb<% else %>text<% end %> :properties
       t.timestamp :time
     end
 

data/lib/generators/ahoy/stores/templates/active_record_visits_migration.rb

@@ -1,8 +1,8 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   def change
     create_table :visits, id: false do |t|
-      t.uuid :id, primary_key: true
-      t.uuid :visitor_id
+      t.uuid :id, default: nil, primary_key: true
+      t.uuid :visitor_id, default: nil
 
       # the rest are recommended but optional
       # simply remove the columns you don't want
@@ -32,6 +32,9 @@ class <%= migration_class_name %> < ActiveRecord::Migration
       t.string :country
       t.string :region
       t.string :city
+      t.string :postal_code
+      t.decimal :latitude
+      t.decimal :longitude
 
       # utm parameters
       t.string :utm_source

data/lib/generators/ahoy/stores/templates/custom_initializer.rb

@@ -1,5 +1,4 @@
 class Ahoy::Store < Ahoy::Stores::BaseStore
-
   def track_visit(options)
   end
 
@@ -8,5 +7,4 @@ class Ahoy::Store < Ahoy::Stores::BaseStore
 
   def current_visit
   end
-
 end

data/lib/generators/ahoy/stores/templates/fluentd_initializer.rb

@@ -0,0 +1,3 @@
+class Ahoy::Store < Ahoy::Stores::FluentdStore
+  # customize here
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -205,10 +205,12 @@ files:
 - lib/ahoy/deckhands/utm_parameter_deckhand.rb
 - lib/ahoy/engine.rb
 - lib/ahoy/geocode_job.rb
+- lib/ahoy/logger_silencer.rb
 - lib/ahoy/model.rb
 - lib/ahoy/stores/active_record_store.rb
 - lib/ahoy/stores/active_record_token_store.rb
 - lib/ahoy/stores/base_store.rb
+- lib/ahoy/stores/fluentd_store.rb
 - lib/ahoy/stores/log_store.rb
 - lib/ahoy/stores/mongoid_store.rb
 - lib/ahoy/subscribers/active_record.rb
@@ -221,6 +223,7 @@ files:
 - lib/generators/ahoy/stores/active_record_generator.rb
 - lib/generators/ahoy/stores/active_record_visits_generator.rb
 - lib/generators/ahoy/stores/custom_generator.rb
+- lib/generators/ahoy/stores/fluentd_generator.rb
 - lib/generators/ahoy/stores/log_generator.rb
 - lib/generators/ahoy/stores/mongoid_events_generator.rb
 - lib/generators/ahoy/stores/mongoid_generator.rb
@@ -231,6 +234,7 @@ files:
 - lib/generators/ahoy/stores/templates/active_record_visit_model.rb
 - lib/generators/ahoy/stores/templates/active_record_visits_migration.rb
 - lib/generators/ahoy/stores/templates/custom_initializer.rb
+- lib/generators/ahoy/stores/templates/fluentd_initializer.rb
 - lib/generators/ahoy/stores/templates/log_initializer.rb
 - lib/generators/ahoy/stores/templates/mongoid_event_model.rb
 - lib/generators/ahoy/stores/templates/mongoid_initializer.rb
@@ -258,10 +262,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple, powerful visit tracking for Rails
 test_files:
 - test/test_helper.rb
 - test/visit_properties_test.rb
+has_rdoc: