staccato-rack 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTgwMzI4NDk3OWE0OWE1NDY2MzFjNTU2NzI1YTRkNDljOTUzNjg2Mw==
+    YWM4ZDYzNTQ2YmU0MmQ4MDgwYjFlNzZhZmE4ZTU2NjYyNjM2MDI5Zg==
   data.tar.gz: !binary |-
-    YzA3ZGRkNzI5MTc0NTcwMjA3ZDgyNDhjYmY4MWNmNjNiNjI1NTUwYw==
+    N2RlMjZiODM2Zjc3Mjg1ZWNiN2NhMTg1ZjAyOWJkZTc0MjdmMmJmMA==
 SHA512:
   metadata.gz: !binary |-
-    Y2VlOTI0MDNmYzEyYzQyY2JlODEyNGU1NGYyMjU2OGJlYWExMWQ4ZDQzMzRh
-    NjBhMmZiY2VjMjY1ZDFkMmJmODEwODJiY2I2ODk0NTRiMWU0OWYyOGRiMDJl
-    OTk4ZGIwMTkzYTI3OWQzZGQwZDFkZWIyZDI5MDQyZTNiZTY1ZmQ=
+    Yjk1ZTc4YTM3NzNmZGZmNTc2MjJiNmQ1NzgyNzk0MjMwNDEyZmQ4MWM5ZWNk
+    NmU5YjNkOTViMThjMzIxMTcxOTg0MmRjMTA2Y2JjNmE4NDQzN2I0MWQ4NTg3
+    NDUzMjk2Njg4ZjFhNWVjNWJlMGM1Y2Q1Y2IwZjVjY2VhZTU0NjY=
   data.tar.gz: !binary |-
-    MDJjZjBkNGFjYWI3Y2I2YWRhNmQzMzk3Y2JiNWU0YzQyYzlkNzMyNDc0Yzky
-    MjYzYjAwZTYyN2NmYTJhOWY1Y2ViNDQwNjZlYjBlMjM1ZjVhZjk4OTQwMGYy
-    YzUzZWNjMDQzZWVkMDQ2ZmMzODYyMDkwNDM3NTdjNjMxZWJhODE=
+    YWRhODgzMzVkNDgwNzlhYzBjNTE1OGEzOTdjZmRhNDBmZjI3MDQzM2NjMjU0
+    ZGVkYWI3ZWRiNmZhZWJhZTc5MGMwNGI0YTk3ODk3MGQzNzA3MTk1MzgxYzM5
+    ODFlM2FlNWVlYmFlODE4NGQ5MDRmNjRiOWQ2ZjAzNmQwNTU0ZWI=

data/README.md

@@ -27,7 +27,7 @@ using in middleware:
 using in your Rails application, add the following line to your application config file (`config/application.rb` for Rails 3 and above, `config/environment.rb` for Rails 2):
 
 ```ruby
-  config.middleware.use Staccato::Rack::Middleware, 'UA-TRACKING-KEY-HERE'
+  config.middleware.use Staccato::Rack::Middleware, 'UA-TRACKING-KEY-HERE', logger: Rails.logger
 ```
 ## Development
 

data/lib/staccato/rack.rb

@@ -5,66 +5,74 @@ require 'ostruct'
 
 module Staccato
   module Rack
-    # middleware
-    class Middleware
-      # page view wrapper
-      class PageView < OpenStruct
-        def initialize
-          super
-          @custom_metrics = []
-          @custom_dimensions = []
-        end
+    class PageView < OpenStruct
+      def initialize
+        super
+        @custom_metrics = []
+        @custom_dimensions = []
+      end
 
-        def add_custom_metric(position, value)
-          @custom_metrics << [position, value]
-        end
+      def add_custom_metric(position, value)
+        @custom_metrics << [position, value]
+      end
 
-        def add_custom_dimension(position, value)
-          @custom_dimensions << [position, value]
-        end
+      def add_custom_dimension(position, value)
+        @custom_dimensions << [position, value]
+      end
 
-        def track!(default_tracker, tracking_id, request)
-          page_view_params = marshal_dump
-          if page_view_params[:client_id]
-            tracker = Staccato.tracker(tracking_id, page_view_params[:client_id])
-          else
-            tracker = default_tracker
-          end
-          track_hit(tracker, page_view_params, request)
+      def track!(default_tracker, tracking_id, request)
+        page_view_params = marshal_dump
+        if page_view_params[:client_id]
+          tracker = Staccato.tracker(tracking_id, page_view_params[:client_id])
+        else
+          tracker = default_tracker
         end
+        track_hit(tracker, page_view_params, request)
+      end
 
-        private
+      private
 
-        def track_hit(tracker, page_view_params, request)
-          hit = Staccato::Pageview.new(tracker, page_view_params.merge(path: request.fullpath,
-                                                                       hostname: request.host,
-                                                                       user_agent: request.env['HTTP_USER_AGENT'],
-                                                                       user_ip: request.ip))
-          add_custom_to_hit(hit)
-          hit.track!
-          hit
-        end
+      def track_hit(tracker, page_view_params, request)
+        hit = Staccato::Pageview.new(tracker, page_view_params.merge(path: request.fullpath,
+                                                                     hostname: request.host,
+                                                                     user_agent: request.env['HTTP_USER_AGENT'],
+                                                                     user_ip: request.ip))
+        add_custom_to_hit(hit)
+        r = hit.track!
+        logger.info "GA Tracking: #{hit.params.inspect} => #{r.response.code}"
+        hit
+      end
 
-        def add_custom_to_hit(hit)
-          @custom_metrics.each do |p, v|
-            hit.add_custom_metric(p, v)
-          end
-          @custom_dimensions.each do |p, v|
-            hit.add_custom_dimension(p, v)
-          end
+      def add_custom_to_hit(hit)
+        @custom_metrics.each do |p, v|
+          hit.add_custom_metric(p, v)
+        end
+        @custom_dimensions.each do |p, v|
+          hit.add_custom_dimension(p, v)
         end
       end
+    end
+
+    class NullLogger
+      def info(*)
+      end
+    end
+
+    # middleware
+    class Middleware
+      # page view wrapper
 
       attr_accessor :last_hit
 
-      def initialize(app, tracking_id)
+      def initialize(app, tracking_id, options = {})
         @app = app
         @tracking_id = tracking_id
         @default_tracker = Staccato.tracker(tracking_id)
+        @logger = options[:logger] || NullLogger.new
       end
 
       def call(env)
-        env['staccato.pageview'] = PageView.new
+        env['staccato.pageview'] = PageView.new.tap{|p| p.logger = @logger }
 
         @last_hit = nil
         status, headers, body  = @app.call(env)

data/lib/staccato/rack/version.rb

@@ -2,6 +2,6 @@
 module Staccato
   # rack module
   module Rack
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staccato-rack
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Grant Speelman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack