ahoy_matey 1.6.1 → 2.0.0

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "1.6.1"
+  VERSION = "2.0.0"
 end

data/lib/ahoy/visit_properties.rb

@@ -1,60 +1,86 @@
+require "browser"
+require "referer-parser"
+require "user_agent_parser"
+
 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, :postal_code, :latitude, :longitude]
-
-    KEYS = REQUEST_KEYS + TRAFFIC_SOURCE_KEYS + UTM_PARAMETER_KEYS + TECHNOLOGY_KEYS + LOCATION_KEYS
-
-    delegate(*REQUEST_KEYS, to: :request_deckhand)
-    delegate(*TRAFFIC_SOURCE_KEYS, to: :traffic_source_deckhand)
-    delegate(*(UTM_PARAMETER_KEYS + [:landing_params]), to: :utm_parameter_deckhand)
-    delegate(*TECHNOLOGY_KEYS, to: :technology_deckhand)
-    delegate(*LOCATION_KEYS, to: :location_deckhand)
+    attr_reader :request, :params, :referrer, :landing_page
 
-    def initialize(request, options = {})
+    def initialize(request, api:)
       @request = request
-      @options = options
+      @params = request.params
+      @referrer = api ? params["referrer"] : request.referer
+      @landing_page = api ? params["landing_page"] : request.original_url
     end
 
-    def [](key)
-      send(key)
+    def generate
+      @generate ||= request_properties.merge(tech_properties).merge(traffic_properties).merge(utm_properties)
     end
 
-    def keys
-      if Ahoy.geocode == true # no location keys for :async
-        KEYS
-      else
-        KEYS - LOCATION_KEYS
-      end
-    end
+    private
 
-    def to_hash
-      keys.inject({}) { |memo, key| memo[key] = send(key); memo }
+    def utm_properties
+      landing_uri = Addressable::URI.parse(landing_page) rescue nil
+      landing_params = (landing_uri && landing_uri.query_values) || {}
+
+      props = {}
+      %w(utm_source utm_medium utm_term utm_content utm_campaign).each do |name|
+        props[name.to_sym] = params[name] || landing_params[name]
+      end
+      props
     end
 
-    protected
+    def traffic_properties
+      # cache for performance
+      @@referrer_parser ||= RefererParser::Parser.new
 
-    def request_deckhand
-      @request_deckhand ||= Deckhands::RequestDeckhand.new(@request, @options)
+      {
+        referring_domain: (Addressable::URI.parse(referrer).host.first(255) rescue nil),
+        search_keyword: (@@referrer_parser.parse(@referrer)[:term][0..255] rescue nil).presence
+      }
     end
 
-    def traffic_source_deckhand
-      @traffic_source_deckhand ||= Deckhands::TrafficSourceDeckhand.new(request_deckhand.referrer)
-    end
+    def tech_properties
+      # cache for performance
+      @@user_agent_parser ||= UserAgentParser::Parser.new
 
-    def utm_parameter_deckhand
-      @utm_parameter_deckhand ||= Deckhands::UtmParameterDeckhand.new(request_deckhand.landing_page, request_deckhand.params)
-    end
+      user_agent = request.user_agent
+      agent = @@user_agent_parser.parse(user_agent)
+      browser = Browser.new(user_agent)
+      device_type =
+        if browser.bot?
+          "Bot"
+        elsif browser.device.tv?
+          "TV"
+        elsif browser.device.console?
+          "Console"
+        elsif browser.device.tablet?
+          "Tablet"
+        elsif browser.device.mobile?
+          "Mobile"
+        else
+          "Desktop"
+        end
 
-    def technology_deckhand
-      @technology_deckhand ||= Deckhands::TechnologyDeckhand.new(request_deckhand.user_agent)
+      {
+        browser: agent.name,
+        os: agent.os.name,
+        device_type: device_type,
+      }
     end
 
-    def location_deckhand
-      @location_deckhand ||= Deckhands::LocationDeckhand.new(request_deckhand.ip)
+    def request_properties
+      {
+        ip: request.remote_ip,
+        user_agent: request.user_agent,
+        referrer: referrer,
+        landing_page: landing_page,
+        platform: params["platform"],
+        app_version: params["app_version"],
+        os_version: params["os_version"],
+        screen_height: params["screen_height"],
+        screen_width: params["screen_width"]
+      }
     end
   end
 end

data/lib/generators/ahoy/activerecord_generator.rb

@@ -0,0 +1,58 @@
+# taken from https://github.com/collectiveidea/audited/blob/master/lib/generators/audited/install_generator.rb
+require "rails/generators"
+require "rails/generators/migration"
+require "active_record"
+require "rails/generators/active_record"
+
+module Ahoy
+  module Generators
+    class ActiverecordGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+      source_root File.expand_path("../templates", __FILE__)
+
+      class_option :database, type: :string, aliases: "-d"
+
+      # Implement the required interface for Rails::Generators::Migration.
+      def self.next_migration_number(dirname) #:nodoc:
+        next_migration_number = current_migration_number(dirname) + 1
+        if ::ActiveRecord::Base.timestamped_migrations
+          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
+        else
+          "%.3d" % next_migration_number
+        end
+      end
+
+      def copy_templates
+        template "database_store_initializer.rb", "config/initializers/ahoy.rb"
+        template "active_record_visit_model.rb", "app/models/ahoy/visit.rb"
+        template "active_record_event_model.rb", "app/models/ahoy/event.rb"
+        migration_template "active_record_migration.rb", "db/migrate/create_ahoy_visits_and_events.rb", migration_version: migration_version
+        migrate_command = rails5? ? "rails" : "rake"
+        puts "\nAlmost set! Last, run:\n\n    #{migrate_command} db:migrate"
+      end
+
+      def properties_type
+        # use connection_config instead of connection.adapter
+        # so database connection isn't needed
+        case ActiveRecord::Base.connection_config[:adapter].to_s
+        when /postg/i # postgres, postgis
+          "jsonb"
+        when /mysql/i
+          "json"
+        else
+          "text"
+        end
+      end
+
+      def rails5?
+        Rails::VERSION::MAJOR >= 5
+      end
+
+      def migration_version
+        if rails5?
+          "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
+        end
+      end
+    end
+  end
+end

data/lib/generators/ahoy/base_generator.rb

@@ -0,0 +1,13 @@
+require "rails/generators"
+
+module Ahoy
+  module Generators
+    class BaseGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_templates
+        template "base_store_initializer.rb", "config/initializers/ahoy.rb"
+      end
+    end
+  end
+end

data/lib/generators/ahoy/install_generator.rb

@@ -0,0 +1,44 @@
+require "rails/generators"
+
+module Ahoy
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_templates
+        activerecord = defined?(ActiveRecord)
+        mongoid = defined?(Mongoid)
+
+        selection =
+          if activerecord && mongoid
+            puts <<-MSG
+
+Which data store would you like to use?
+ 1. ActiveRecord (default)
+ 2. Mongoid
+ 3. Neither
+            MSG
+
+            ask(">")
+          elsif activerecord
+            "1"
+          elsif mongoid
+            "2"
+          else
+            "3"
+          end
+
+        case selection
+        when "", "1"
+          invoke "ahoy:activerecord"
+        when "2"
+          invoke "ahoy:mongoid"
+        when "3"
+          invoke "ahoy:base"
+        else
+          abort "Error: must enter a number [1-3]"
+        end
+      end
+    end
+  end
+end

data/lib/generators/ahoy/mongoid_generator.rb

@@ -0,0 +1,20 @@
+require "rails/generators"
+
+module Ahoy
+  module Generators
+    class MongoidGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_templates
+        template "database_store_initializer.rb", "config/initializers/ahoy.rb"
+        template "mongoid_visit_model.rb", "app/models/ahoy/visit.rb"
+        template "mongoid_event_model.rb", "app/models/ahoy/event.rb"
+        puts "\nAlmost set! Last, run:\n\n    rake db:mongoid:create_indexes"
+      end
+
+      def rails5?
+        Rails::VERSION::MAJOR >= 5
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+class Ahoy::Event < <%= rails5? ? "ApplicationRecord" : "ActiveRecord::Base" %>
+  include Ahoy::QueryMethods
+
+  self.table_name = "ahoy_events"
+
+  belongs_to :visit
+  belongs_to :user<%= rails5? ? ", optional: true" : nil %><% if properties_type == "text" %>
+
+  serialize :properties, JSON<% end %>
+end

data/lib/generators/ahoy/{stores/templates/active_record_visits_migration.rb → templates/active_record_migration.rb}

@@ -1,40 +1,32 @@
 class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :visits do |t|
+   create_table :ahoy_visits do |t|
       t.string :visit_token
       t.string :visitor_token
 
       # the rest are recommended but optional
-      # simply remove the columns you don't want
+      # simply remove any you don't want
+
+      # user
+      t.references :user
 
       # standard
       t.string :ip
       t.text :user_agent
       t.text :referrer
-      t.text :landing_page
-
-      # user
-      t.integer :user_id
-      # add t.string :user_type if polymorphic
-
-      # traffic source
       t.string :referring_domain
       t.string :search_keyword
+      t.text :landing_page
 
       # technology
       t.string :browser
       t.string :os
       t.string :device_type
-      t.integer :screen_height
-      t.integer :screen_width
 
       # location
       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
@@ -43,15 +35,21 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
       t.string :utm_content
       t.string :utm_campaign
 
-      # native apps
-      # t.string :platform
-      # t.string :app_version
-      # t.string :os_version
-
       t.timestamp :started_at
     end
 
-    add_index :visits, [:visit_token], unique: true
-    add_index :visits, [:user_id]
+    add_index :ahoy_visits, [:visit_token], unique: true
+
+    create_table :ahoy_events do |t|
+      t.references :visit
+      t.references :user
+
+      t.string :name
+      t.<%= properties_type %> :properties
+      t.timestamp :time
+    end
+
+    add_index :ahoy_events, [:name, :time]<% if properties_type == "jsonb" && rails5? %>
+    add_index :ahoy_events, "properties jsonb_path_ops", using: "gin"<% end %>
   end
 end

data/lib/generators/ahoy/templates/active_record_visit_model.rb

@@ -0,0 +1,6 @@
+class Ahoy::Visit < <%= rails5? ? "ApplicationRecord" : "ActiveRecord::Base" %>
+  self.table_name = "ahoy_visits"
+
+  has_many :events, class_name: "Ahoy::Event"
+  belongs_to :user<%= rails5? ? ", optional: true" : nil %>
+end

data/lib/generators/ahoy/templates/base_store_initializer.rb

@@ -0,0 +1,17 @@
+class Ahoy::Store < Ahoy::BaseStore
+  def track_visit(data)
+    # do
+  end
+
+  def track_event(data)
+    # something
+  end
+
+  def geocode(data)
+    # amazing
+  end
+
+  def authenticate(data)
+    # !!!
+  end
+end

data/lib/generators/ahoy/templates/database_store_initializer.rb

@@ -0,0 +1,5 @@
+class Ahoy::Store < Ahoy::DatabaseStore
+end
+
+# set to true for JavaScript tracking
+Ahoy.api = false

data/lib/generators/ahoy/{stores/templates → templates}/mongoid_event_model.rb

@@ -2,11 +2,13 @@ class Ahoy::Event
   include Mongoid::Document
 
   # associations
-  belongs_to :visit
-  belongs_to :user
+  belongs_to :visit, index: true
+  belongs_to :user, index: true<%= rails5? ? ", optional: true" : nil %>
 
   # fields
   field :name, type: String
   field :properties, type: Hash
   field :time, type: Time
+
+  index({name: 1, time: 1})
 end

data/lib/generators/ahoy/{stores/templates → templates}/mongoid_visit_model.rb

@@ -1,11 +1,13 @@
-class Visit
+class Ahoy::Visit
   include Mongoid::Document
 
   # associations
-  belongs_to :user
+  has_many :events, class_name: "Ahoy::Event"
+  belongs_to :user, index: true<%= rails5? ? ", optional: true" : nil %>
 
   # required
-  field :visitor_id, type: <%= @visitor_id_type %>
+  field :visit_token, type: String
+  field :visitor_token, type: String
 
   # the rest are recommended but optional
   # simply remove the columns you don't want
@@ -40,4 +42,6 @@ class Visit
   field :utm_campaign, type: String
 
   field :started_at, type: Time
+
+  index({visit_token: 1}, {unique: true})
 end

data/test/query_methods/mongoid_test.rb

@@ -0,0 +1,23 @@
+require_relative "../test_helper"
+
+Mongoid.logger.level = Logger::WARN
+Mongo::Logger.logger.level = Logger::WARN
+
+Mongoid.configure do |config|
+  config.connect_to("ahoy_test")
+end
+
+class MongoidEvent
+  include Mongoid::Document
+  include Ahoy::QueryMethods
+
+  field :properties, type: Hash
+end
+
+class MongoidTest < Minitest::Test
+  include QueryMethodsTest
+
+  def model
+    MongoidEvent
+  end
+end