ahoy_matey 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e588efc9bc71536e8077c79e1b874db35333d92
-  data.tar.gz: 1c97d1fc30240204a78519d8a3866e68351d40b9
+  metadata.gz: 2650b75c743530def251ca5e74c48c5a0a6654cc
+  data.tar.gz: 2dae4a806be1b4bd07d11f355440dedb2af33d85
 SHA512:
-  metadata.gz: e448cfa2434da5e946fc7be76dcb0b626f70301828c2fa21fb19ea94e7d2e0d0faeb6d1b140159e9ee4e0de8a805322650d78fe41bf456d3698adc13ccc3e117
-  data.tar.gz: 795e1ecfb5d87235bd9e3fd66e0714afbda91b9e8ace354509345b12aa62e98e88379874263348b3f96464d18620d8c5db137542716e36e37345df0cfa168aa2
+  metadata.gz: 04ffd75191af402b3d371f3f641feda3b56482658163b6f4c00838da8c31debd812747199f707a7b87885291cab37855457d76b67a060dd07698bc298993d047
+  data.tar.gz: 28b522d37a313db0a4987bef9b7521642e0f5c6c44f01e71f3332df4095804d03b2ac68e20ebf106b7ebb6020a84c3a5c189910d0fe0d7cd7d2f3435c89be329

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.2
+
+- Fixed BSON for Mongoid 3
+- Fixed Doorkeeper integration
+- Fixed user tracking in overridden authenticate method
+
 ## 1.0.1
 
 - Fixed `visitable` outside of requests

data/README.md

@@ -27,11 +27,15 @@ And add the javascript file in `app/assets/javascripts/application.js` after jQu
 
 ### PostgreSQL
 
+For Rails 4 and PostgreSQL 9.2 or greater, use:
+
 ```sh
 rails generate ahoy:stores:active_record -d postgresql
 rake db:migrate
 ```
 
+Otherwise, follow the instructions for MySQL.
+
 ### MySQL or SQLite
 
 Add [activeuuid](https://github.com/jashmenn/activeuuid) to your Gemfile.

data/app/controllers/ahoy/events_controller.rb

@@ -2,7 +2,19 @@ module Ahoy
   class EventsController < Ahoy::BaseController
 
     def create
-      events = params[:name] ? [params] : ActiveSupport::JSON.decode(request.body.read)
+      events =
+        if params[:name]
+          # legacy API
+          [params]
+        else
+          begin
+            ActiveSupport::JSON.decode(request.body.read)
+          rescue ActiveSupport::JSON.parse_error
+            # do nothing
+            []
+          end
+        end
+
       events.each do |event|
         time = Time.zone.parse(event["time"]) rescue nil
 

data/lib/ahoy.rb

@@ -56,14 +56,8 @@ module Ahoy
   # deprecated
 
   mattr_accessor :domain
-
   mattr_accessor :visit_model
-
   mattr_accessor :user_method
-  self.user_method = proc do |controller|
-    (controller.respond_to?(:current_user) && controller.current_user) || (controller.respond_to?(:current_resource_owner, true) && controller.send(:current_resource_owner)) || nil
-  end
-
   mattr_accessor :exclude_method
 
   mattr_accessor :subscribers

data/lib/ahoy/stores/active_record_token_store.rb

@@ -77,11 +77,15 @@ module Ahoy
       end
 
       def user
-        user_method = Ahoy.user_method
-        if user_method.respond_to?(:call)
-          user_method.call(controller)
-        else
-          controller.send(user_method)
+        @user ||= begin
+          user_method = Ahoy.user_method
+          if user_method.respond_to?(:call)
+            user_method.call(controller)
+          elsif user_method
+            controller.send(user_method)
+          else
+            super
+          end
         end
       end
 

data/lib/ahoy/stores/base_store.rb

@@ -27,7 +27,7 @@ module Ahoy
       end
 
       def user
-        @user ||= controller.current_user
+        @user ||= (controller.respond_to?(:current_user) && controller.current_user) || (controller.respond_to?(:current_resource_owner, true) && controller.send(:current_resource_owner)) || nil
       end
 
       def exclude?

data/lib/ahoy/stores/mongoid_store.rb

@@ -51,7 +51,14 @@ module Ahoy
       end
 
       def binary(token)
-        ::BSON::Binary.new(token.delete("-"), :uuid)
+        token = token.delete("-")
+        if defined?(::BSON)
+          ::BSON::Binary.new(token, :uuid)
+        elsif defined?(::Moped::BSON)
+          ::Moped::BSON::Binary.new(:uuid, token)
+        else
+          token
+        end
       end
 
     end

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

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

@@ -7,6 +7,14 @@ module Ahoy
         source_root File.expand_path("../templates", __FILE__)
 
         def generate_model
+          @visitor_id_type =
+            if defined?(::BSON)
+              "BSON::Binary"
+            elsif defined?(::Moped::BSON)
+              "Moped::BSON::Binary"
+            else
+              "String"
+            end
           template "mongoid_visit_model.rb", "app/models/visit.rb"
         end
 

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

@@ -5,7 +5,7 @@ class Visit
   belongs_to :user
 
   # required
-  field :visitor_id, type: BSON::Binary
+  field :visitor_id, type: <%= @visitor_id_type %>
 
   # the rest are recommended but optional
   # simply remove the columns you don't want

metadata

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