ahoy_matey 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78e1ff8eb75ded92834b341ed0319b37d784f5bd
-  data.tar.gz: ac76baab29e95a2f7fe69d9505b2dc08ab31cfe5
+  metadata.gz: fb739af8b0e101e97b738d5839b438da101fc41f
+  data.tar.gz: 5c202d2758f9fe5b33a6aa142e8a2c7520ff1f92
 SHA512:
-  metadata.gz: 87fecfd6cf70712efc9e7bde3e64587b86ab3f85f41b3fe68165e85a5fe37f67bff8f9d590bcf46a1b0ca6fe2312aa3253131790a2bde92acb766fbccdf39b9a
-  data.tar.gz: fc2abee96f713a6b072290b53b64b2dfa164f0764404b1c8d0fff708e0e1d18f586790ff65eaf1f5b6834958144fbd4b5b3f25050f7722ac28d0ef3124fb4ebf
+  metadata.gz: 7d65012b0f13dc8c79bc0efed4ef4c0f5618fa5356eab36881cd44ebcf74029b9ab8820a6b160cf4d4713e8a910bb17e6f57391e0add52804855dd8963c7a58c
+  data.tar.gz: a16fb236d50969a9a3ba95ca28f2f1f6e4ffa4c6715eedb854bec2cb7f57257a4812d4b46c94ae0fdfd44146b9e60f336faf3944976e3d0dbf221ade9c6d3088

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.5.5
+
+- Added support for Rails API
+- Added NATS and NSQ stores
+
 ## 1.5.4
 
 - Fixed issue with duplicate events

data/README.md

@@ -29,10 +29,7 @@ Ahoy supports a number of data stores out of the box.  You can start with one of
 
 - [PostgreSQL, MySQL, or SQLite](#postgresql-mysql-or-sqlite)
 - [MongoDB](#mongodb)
-- [Kafka](#kafka)
-- [Fluentd](#fluentd)
-- [RabbitMQ](#rabbitmq)
-- [Amazon Kinesis Firehose](#amazon-kinesis-firehose)
+- [Kafka](#kafka), [Fluentd](#fluentd), [RabbitMQ](#rabbitmq), [NATS](#nats), [NSQ](#nsq), or [Amazon Kinesis Firehose](#amazon-kinesis-firehose)
 - [Logs](#logs)
 - [Custom](#custom)
 
@@ -47,6 +44,8 @@ rake db:migrate
 
 ### MongoDB
 
+Run:
+
 ```sh
 rails generate ahoy:stores:mongoid
 ```
@@ -99,6 +98,38 @@ rails generate ahoy:stores:bunny
 
 Use `ENV["RABBITMQ_URL"]` to configure.
 
+### NATS
+
+Add [nats-pure](https://github.com/nats-io/pure-ruby-nats) to your Gemfile.
+
+```ruby
+gem 'nats-pure'
+```
+
+And run:
+
+```sh
+rails generate ahoy:stores:nats
+```
+
+Use `ENV["NATS_URL"]` to configure.
+
+### NSQ
+
+Add [nsq-ruby](https://github.com/wistia/nsq-ruby) to your Gemfile.
+
+```ruby
+gem 'nsq-ruby'
+```
+
+And run:
+
+```sh
+rails generate ahoy:stores:nsq
+```
+
+Use `ENV["NSQ_URL"]` to configure.
+
 ### Amazon Kinesis Firehose
 
 Add [aws-sdk](https://github.com/aws/aws-sdk-ruby) to your Gemfile.
@@ -261,7 +292,7 @@ Exceptions are rescued so analytics do not break your app. Ahoy uses [Safely](ht
 To customize this, use:
 
 ```ruby
-Safely.report_exception_method = proc { |e| Rollbar.error(e) }
+Safely.report_exception_method = -> (e) { Rollbar.error(e) }
 ```
 
 ### Use Different Models

data/lib/ahoy.rb

@@ -27,6 +27,8 @@ require "ahoy/stores/log_store"
 require "ahoy/stores/fluentd_store"
 require "ahoy/stores/mongoid_store"
 require "ahoy/stores/kafka_store"
+require "ahoy/stores/nats_store"
+require "ahoy/stores/nsq_store"
 require "ahoy/stores/kinesis_firehose_store"
 require "ahoy/stores/bunny_store"
 require "ahoy/engine" if defined?(Rails)
@@ -116,6 +118,7 @@ end
 if defined?(Rails)
   ActiveSupport.on_load(:action_controller) do
     ActionController::Base.send :include, Ahoy::Controller
+    ActionController::API.send :include, Ahoy::Controller if defined?(ActionController::API)
   end
 
   ActiveSupport.on_load(:active_record) do

data/lib/ahoy/controller.rb

@@ -3,8 +3,10 @@ require "request_store"
 module Ahoy
   module Controller
     def self.included(base)
-      base.helper_method :current_visit
-      base.helper_method :ahoy
+      if base.respond_to?(:helper_method)
+        base.helper_method :current_visit
+        base.helper_method :ahoy
+      end
       if base.respond_to?(:before_action)
         base.before_action :set_ahoy_cookies, unless: -> { Ahoy.api_only }
         base.before_action :track_ahoy_visit, unless: -> { Ahoy.api_only }

data/lib/ahoy/stores/active_record_store.rb

@@ -18,7 +18,8 @@ module Ahoy
           visit.save!
           geocode(visit)
         rescue *unique_exception_classes
-          # do nothing
+          # reset to nil so subsequent calls to track_event will load visit from DB
+          @visit = nil
         end
       end
 

data/lib/ahoy/stores/active_record_token_store.rb

@@ -19,7 +19,8 @@ module Ahoy
           visit.save!
           geocode(visit)
         rescue *unique_exception_classes
-          # do nothing
+          # reset to nil so subsequent calls to track_event will load visit from DB
+          @visit = nil
         end
       end
 
@@ -43,7 +44,7 @@ module Ahoy
           event =
             event_model.new do |e|
               e.visit_id = visit.try(:id)
-              e.user = user
+              e.user = user if e.respond_to?(:user=)
               e.name = name
               e.properties = properties
               e.time = options[:time]

data/lib/ahoy/stores/nats_store.rb

@@ -0,0 +1,34 @@
+module Ahoy
+  module Stores
+    class NatsStore < LogStore
+      def log_visit(data)
+        publish(visits_subject, data)
+      end
+
+      def log_event(data)
+        publish(events_subject, data)
+      end
+
+      def publish(subject, data)
+        client.publish(subject, data.to_json)
+      end
+
+      def client
+        @client ||= begin
+          require "nats/io/client"
+          client = NATS::IO::Client.new
+          client.connect(servers: (ENV["NATS_URL"] || "nats://127.0.0.1:4222").split(","))
+          client
+        end
+      end
+
+      def visits_subject
+        "ahoy_visits"
+      end
+
+      def events_subject
+        "ahoy_events"
+      end
+    end
+  end
+end

data/lib/ahoy/stores/nsq_store.rb

@@ -0,0 +1,36 @@
+module Ahoy
+  module Stores
+    class NsqStore < LogStore
+      def log_visit(data)
+        post(visits_topic, data)
+      end
+
+      def log_event(data)
+        post(events_topic, data)
+      end
+
+      def client
+        @client ||= begin
+          require "nsq"
+          client = Nsq::Producer.new(
+            nsqd: ENV["NSQ_URL"] || "127.0.0.1:4150"
+          )
+          at_exit { client.terminate }
+          client
+        end
+      end
+
+      def post(topic, data)
+        client.write_to_topic(topic, data.to_json)
+      end
+
+      def visits_topic
+        "ahoy_visits"
+      end
+
+      def events_topic
+        "ahoy_events"
+      end
+    end
+  end
+end

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end

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

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

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

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

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

@@ -0,0 +1,9 @@
+class Ahoy::Store < Ahoy::Stores::NatsStore
+  def visits_subject
+    "ahoy_visits"
+  end
+
+  def events_subject
+    "ahoy_events"
+  end
+end

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

@@ -0,0 +1,9 @@
+class Ahoy::Store < Ahoy::Stores::NsqStore
+  def visits_topic
+    "ahoy_visits"
+  end
+
+  def events_topic
+    "ahoy_events"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -273,6 +273,8 @@ files:
 - lib/ahoy/stores/kinesis_firehose_store.rb
 - lib/ahoy/stores/log_store.rb
 - lib/ahoy/stores/mongoid_store.rb
+- lib/ahoy/stores/nats_store.rb
+- lib/ahoy/stores/nsq_store.rb
 - lib/ahoy/subscribers/active_record.rb
 - lib/ahoy/throttle.rb
 - lib/ahoy/tracker.rb
@@ -292,6 +294,8 @@ files:
 - lib/generators/ahoy/stores/mongoid_events_generator.rb
 - lib/generators/ahoy/stores/mongoid_generator.rb
 - lib/generators/ahoy/stores/mongoid_visits_generator.rb
+- lib/generators/ahoy/stores/nats_generator.rb
+- lib/generators/ahoy/stores/nsq_generator.rb
 - lib/generators/ahoy/stores/templates/active_record_event_model.rb
 - lib/generators/ahoy/stores/templates/active_record_events_migration.rb
 - lib/generators/ahoy/stores/templates/active_record_initializer.rb
@@ -306,6 +310,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
+- lib/generators/ahoy/stores/templates/nats_initializer.rb
+- lib/generators/ahoy/stores/templates/nsq_initializer.rb
 - test/properties/mysql_json_test.rb
 - test/properties/mysql_text_test.rb
 - test/properties/postgresql_hstore_test.rb