ahoy_matey 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3662bc02fad0423af6a7a745137718af5976244a
-  data.tar.gz: 69331b2acf1a7c75266bd6e88adba510afb8a02c
+  metadata.gz: 14b16720c567a2d253632b9a2a238273c1efb192
+  data.tar.gz: fa9aa63ecb5aaa91c44c9a617c4bccfa3f37f6c1
 SHA512:
-  metadata.gz: 6496bb48e9e1ea773ce5ad3bd229f51458177a141d48c311fa23f1211a4f73b0de21d10ea38640d8d30686020d8ce777f83d7fe5a8b3e96ec973abc1848e8168
-  data.tar.gz: 66d169b4168bb2ad2f032259331c863dcaccc6295ae0e9002a6c1df4fa2e6dcaea49e784055f517160caa7c801d84390495d10b2b90f422617c9337537290ef3
+  metadata.gz: a77b0b9f3ba3bfd134f848a531406778a46ae213b532945b80e0e2d11e81019ee22d1c55b8967e1913dd5b01aa6814d2e0b512dc500fe7a856e5f33adad35455
+  data.tar.gz: 6f616904606aaf1af958a8defed7a2fd6ddf9297af5872a3746062ec74ce76cf8eb5c63c606ab45c10884d5119c6f3de45c1e618f892fa1495342a182b3adf28

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.5.3
+
+- Fixed error with Rails 5 and Mongoid 6
+- Fixed regression with server not generating visit and visitor tokens
+- Accept UTM parameters as request parameters (for native apps)
+
 ## 1.5.2
 
 - Better support for Rails 5

data/README.md

@@ -139,7 +139,7 @@ class Ahoy::Store < Ahoy::Stores::BaseStore
 end
 ```
 
-See the [ActiveRecordStore](https://github.com/ankane/ahoy/blob/master/lib/ahoy/stores/active_record_store.rb) for an example.
+See the [ActiveRecordTokenStore](https://github.com/ankane/ahoy/blob/master/lib/ahoy/stores/active_record_token_store.rb) for an example.
 
 ## How It Works
 
@@ -238,6 +238,8 @@ class Ahoy::Store < Ahoy::Stores::ActiveRecordTokenStore
 end
 ```
 
+Some methods you can use are `request`, `controller`, `visit_properties`, and `ahoy`.
+
 ### Customize User
 
 If you use a method other than `current_user`, set it here:
@@ -497,7 +499,16 @@ With ActiveRecord, use:
 Ahoy::Event.where(name: "Viewed product").where_properties(product_id: 123).count
 ```
 
-**Note:** If you get a `NoMethodError`, upgrade Ahoy and add `include Ahoy::Properties` to your model.
+**Note:** If you get a `NoMethodError`, upgrade Ahoy and add `include Ahoy::Properties` to the Ahoy::Event class:
+
+```ruby
+module Ahoy
+  class Event < ActiveRecord::Base
+    include Ahoy::Properties
+    ...
+  end
+end
+```
 
 ## Native Apps
 
@@ -542,7 +553,7 @@ Ahoy.mount = false
 
 ### 1.4.0
 
-There’s nothing to do, but it’s worth noting the default store was changed from `ActiveRecordStore` to `ActiveRecordTokenStore` for new installations.
+There’s nothing to do, but it’s worth noting the default store was changed from `ActiveRecordStore` to `ActiveRecordTokenStore` for new installations. `ActiveRecordStore` will continue to be supported.
 
 ### json -> jsonb
 

data/app/controllers/ahoy/base_controller.rb

@@ -15,7 +15,9 @@ module Ahoy
       before_filter :verify_request_size
     end
 
-    protect_from_forgery with: :null_session, if: -> { Ahoy.protect_from_forgery }
+    if respond_to?(:protect_from_forgery)
+      protect_from_forgery with: :null_session, if: -> { Ahoy.protect_from_forgery }
+    end
 
     protected
 

data/app/controllers/ahoy/events_controller.rb

@@ -4,9 +4,9 @@ module Ahoy
       events =
         if params[:name]
           # legacy API
-          [params]
+          [request.params]
         elsif params[:events]
-          params[:events]
+          request.params[:events]
         else
           begin
             ActiveSupport::JSON.decode(request.body.read)

data/lib/ahoy/deckhands/request_deckhand.rb

@@ -44,8 +44,6 @@ module Ahoy
         params["screen_width"]
       end
 
-      private
-
       def params
         @params ||= request.params
       end

data/lib/ahoy/deckhands/utm_parameter_deckhand.rb

@@ -1,8 +1,9 @@
 module Ahoy
   module Deckhands
     class UtmParameterDeckhand
-      def initialize(landing_page)
+      def initialize(landing_page, params = nil)
         @landing_page = landing_page
+        @params = params || {}
       end
 
       def landing_params
@@ -14,7 +15,7 @@ module Ahoy
 
       %w(utm_source utm_medium utm_term utm_content utm_campaign).each do |name|
         define_method name do
-          landing_params[name]
+          @params[name] || landing_params[name]
         end
       end
     end

data/lib/ahoy/stores/active_record_token_store.rb

@@ -56,7 +56,7 @@ module Ahoy
       end
 
       def visit
-        @visit ||= visit_model.where(visit_token: ahoy.visit_token).first if ahoy.visit_token
+        @visit ||= (visit_model.where(visit_token: ahoy.visit_token).first if ahoy.visit_token)
       end
 
       def exclude?

data/lib/ahoy/tracker.rb

@@ -160,7 +160,7 @@ module Ahoy
     def visit_token_helper
       @visit_token_helper ||= begin
         token = existing_visit_token
-        token ||= generate_id unless api?
+        token ||= generate_id unless Ahoy.api_only
         token
       end
     end
@@ -168,7 +168,7 @@ module Ahoy
     def visitor_token_helper
       @visitor_token_helper ||= begin
         token = existing_visitor_token
-        token ||= generate_id unless api?
+        token ||= generate_id unless Ahoy.api_only
         token
       end
     end

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

data/lib/ahoy/visit_properties.rb

@@ -46,7 +46,7 @@ module Ahoy
     end
 
     def utm_parameter_deckhand
-      @utm_parameter_deckhand ||= Deckhands::UtmParameterDeckhand.new(request_deckhand.landing_page)
+      @utm_parameter_deckhand ||= Deckhands::UtmParameterDeckhand.new(request_deckhand.landing_page, request_deckhand.params)
     end
 
     def technology_deckhand

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple, powerful visit tracking for Rails
@@ -348,4 +348,3 @@ test_files:
 - test/properties/postgresql_text_test.rb
 - test/test_helper.rb
 - test/visit_properties_test.rb
-has_rdoc: