ahoy_matey 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 242d802ebd49a361498abd778f6584270403a044
-  data.tar.gz: fbac0f07a91a227d362f81c59b9e5407f12a1914
+  metadata.gz: 40291bf283651d14352010eda0c253cebed87db6
+  data.tar.gz: 0ecfe15d70e6be8c3d4078b7148049edad546401
 SHA512:
-  metadata.gz: 480eb913a57be006b6ed8a9387381f97fa90093ddf81f7509279e1821da88af79a50bb48811f61133efc480018e2ee09bca1f194e9a1a66ae130322abaf7f9d4
-  data.tar.gz: ad94528f28a55a852638cea255b0e17e0a1ecc941231f2bf2830faaa77541c736a17196baab0279771cdca5c20bb172d437b0f33f833c0e6dd5bcbfc7db46787
+  metadata.gz: bdc0d68f6ef24f2da215fa89a1b0a0a1dcb44b2a85e09eea078c2dc95d2705b776e0dda75e962563261bd7029a1ed28587128ea63129865045ba21fa53929fe9
+  data.tar.gz: ecd7f16f4c533da8970adc20dae85fdcebb661be1d87872b269ddc7b53ad453ff3b5f72a1f82bc1888f29f77ed390d4e27a21715545f17d7e15c3d51d256ff71

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-## 1.1.0 [unreleased]
+## 1.1.1
+
+- Better support for Authlogic
+- Added `screen_height` and `screen_width`
+
+## 1.1.0
 
 - Added `geocode` option
 - Report errors to service by default

data/README.md

@@ -404,7 +404,7 @@ Visit.group(:referring_domain).count
 [Chartkick](http://chartkick.com/) and [Groupdate](https://github.com/ankane/groupdate) make it super easy to visualize the data.
 
 ```erb
-<%= line_chart Visit.group_by_day(:created_at).count %>
+<%= line_chart Visit.group_by_day(:started_at).count %>
 ```
 
 See where orders are coming from with simple joins:

data/Rakefile

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

data/ahoy_matey.gemspec

@@ -18,10 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "rails"
   spec.add_dependency "addressable"
   spec.add_dependency "browser", ">= 0.4.0"
   spec.add_dependency "geocoder"
-  spec.add_dependency "referer-parser"
+  spec.add_dependency "referer-parser", ">= 0.3.0"
   spec.add_dependency "user_agent_parser"
   spec.add_dependency "request_store"
   spec.add_dependency "uuidtools"
@@ -29,4 +30,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 end

data/app/controllers/ahoy/base_controller.rb

@@ -1,7 +1,7 @@
 module Ahoy
   class BaseController < ApplicationController
-    # skip all filters
-    skip_filter *_process_action_callbacks.map(&:filter)
+    # skip all filters except for authlogic
+    skip_filter *(_process_action_callbacks.map(&:filter) - [:load_authlogic])
 
     def ahoy
       @ahoy ||= Ahoy::Tracker.new(controller: self, api: true)

data/lib/ahoy/deckhands/request_deckhand.rb

@@ -36,6 +36,14 @@ module Ahoy
         request.params["os_version"]
       end
 
+      def screen_height
+        request.params["screen_height"]
+      end
+
+      def screen_width
+        request.params["screen_width"]
+      end
+
     end
   end
 end

data/lib/ahoy/deckhands/traffic_source_deckhand.rb

@@ -11,12 +11,12 @@ module Ahoy
       end
 
       def search_keyword
-        @search_keyword ||= (self.class.referrer_parser.parse(@referrer)[1].first(255) rescue nil).presence
+        @search_keyword ||= (self.class.referrer_parser.parse(@referrer)[:term][0..255] rescue nil).presence
       end
 
       # performance hack for referer-parser
       def self.referrer_parser
-        @referrer_parser ||= RefererParser::Referer.new("https://github.com/ankane/ahoy")
+        @referrer_parser ||= RefererParser::Parser.new
       end
 
     end

data/lib/ahoy/stores/active_record_store.rb

@@ -18,7 +18,7 @@ module Ahoy
         begin
           visit.save!
           geocode(visit)
-        rescue ActiveRecord::RecordNotUnique
+        rescue *unique_exception_classes
           # do nothing
         end
       end
@@ -38,7 +38,7 @@ module Ahoy
 
         begin
           event.save!
-        rescue ActiveRecord::RecordNotUnique
+        rescue *unique_exception_classes
           # do nothing
         end
       end

data/lib/ahoy/stores/active_record_token_store.rb

@@ -18,7 +18,7 @@ module Ahoy
         begin
           visit.save!
           geocode(visit)
-        rescue ActiveRecord::RecordNotUnique
+        rescue *unique_exception_classes
           # do nothing
         end
       end

data/lib/ahoy/stores/base_store.rb

@@ -67,7 +67,6 @@ module Ahoy
 
       def set_visit_properties(visit)
         keys = visit_properties.keys
-        keys -= Ahoy::VisitProperties::LOCATION_KEYS if Ahoy.geocode != true
         keys.each do |key|
           visit.send(:"#{key}=", visit_properties[key]) if visit.respond_to?(:"#{key}=") && visit_properties[key]
         end
@@ -79,6 +78,13 @@ module Ahoy
         end
       end
 
+      def unique_exception_classes
+        classes = []
+        classes << ActiveRecord::RecordNotUnique if defined?(ActiveRecord::RecordNotUnique)
+        classes << PG::UniqueViolation if defined?(PG::UniqueViolation)
+        classes
+      end
+
     end
   end
 end

data/lib/ahoy/version.rb

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

data/lib/ahoy/visit_properties.rb

@@ -1,7 +1,7 @@
 module Ahoy
   class VisitProperties
 
-    REQUEST_KEYS = [:ip, :user_agent, :referrer, :landing_page, :platform, :app_version, :os_version]
+    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]
@@ -25,7 +25,11 @@ module Ahoy
     end
 
     def keys
-      KEYS
+      if Ahoy.geocode == true # no location keys for :async
+        KEYS
+      else
+        KEYS - LOCATION_KEYS
+      end
     end
 
     def to_hash

data/lib/ahoy.rb

@@ -1,3 +1,4 @@
+require "rails"
 require "addressable/uri"
 require "browser"
 require "geocoder"

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

@@ -25,6 +25,8 @@ class <%= migration_class_name %> < ActiveRecord::Migration
       t.string :browser
       t.string :os
       t.string :device_type
+      t.integer :screen_height
+      t.integer :screen_width
 
       # location
       t.string :country

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

@@ -24,6 +24,8 @@ class Visit
   field :browser, type: String
   field :os, type: String
   field :device_type, type: String
+  field :screen_height, type: Integer
+  field :screen_width, type: Integer
 
   # location
   field :country, type: String

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require "bundler/setup"
+Bundler.require(:default)
+require "minitest/autorun"
+require "minitest/pride"

data/test/visit_properties_test.rb

@@ -0,0 +1,44 @@
+require_relative "test_helper"
+
+class TestVisitProperties < Minitest::Test
+  def setup
+    request = MiniTest::Mock.new
+    @visit_properties = Ahoy::VisitProperties.new(request)
+  end
+
+  def test_keys
+    with_geocode(true) do
+      assert_equal @visit_properties.keys, Ahoy::VisitProperties::KEYS
+    end
+  end
+
+  def test_keys_when_geocode_disabled
+    with_geocode(false) do
+      keys = @visit_properties.keys
+
+      refute keys.include?(:country)
+      refute keys.include?(:region)
+      refute keys.include?(:city)
+    end
+  end
+
+  def test_keys_when_geocode_async
+    with_geocode(:async) do
+      keys = @visit_properties.keys
+
+      refute keys.include?(:country)
+      refute keys.include?(:region)
+      refute keys.include?(:city)
+    end
+  end
+
+  private
+
+  def with_geocode(enabled)
+    original = Ahoy.geocode
+    Ahoy.geocode = enabled
+    yield
+  ensure
+    Ahoy.geocode = original
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: user_agent_parser
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple, powerful visit tracking for Rails
 email:
 - andrew@chartkick.com
@@ -207,6 +235,8 @@ files:
 - lib/generators/ahoy/stores/templates/mongoid_event_model.rb
 - lib/generators/ahoy/stores/templates/mongoid_initializer.rb
 - lib/generators/ahoy/stores/templates/mongoid_visit_model.rb
+- test/test_helper.rb
+- test/visit_properties_test.rb
 - vendor/assets/javascripts/ahoy.js
 homepage: https://github.com/ankane/ahoy
 licenses:
@@ -232,4 +262,6 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple, powerful visit tracking for Rails
-test_files: []
+test_files:
+- test/test_helper.rb
+- test/visit_properties_test.rb