staccato-rack 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzQ4NDljNWM0OTk5YTQzYzI4ZWQzZjE1NzNmMzYyNDc0Mjk2ZGQwNw==
+    OTgwMzI4NDk3OWE0OWE1NDY2MzFjNTU2NzI1YTRkNDljOTUzNjg2Mw==
   data.tar.gz: !binary |-
-    MjgzM2M2MmRhZjRhOTExZDBhNmM5Y2I1ZGFmYTYzMzZkOGFkY2NmZA==
+    YzA3ZGRkNzI5MTc0NTcwMjA3ZDgyNDhjYmY4MWNmNjNiNjI1NTUwYw==
 SHA512:
   metadata.gz: !binary |-
-    ZWM5M2EwMzg4ZDMyNWU4Zjk4Y2I3ODk1OTY1YTQ2NWUyN2MxY2Q2Y2RmNzI4
-    YzY2NzU5NTg5MGY0ZjJjYmY3MzYwOGM1Y2FiZDgzNzk5OTgzOWZlYjE5Mzlh
-    NzlhMGZjNzU3ZmE3MDY4OTM1OGZkNmU0NTkzNTVlOWFlZGY3OTU=
+    Y2VlOTI0MDNmYzEyYzQyY2JlODEyNGU1NGYyMjU2OGJlYWExMWQ4ZDQzMzRh
+    NjBhMmZiY2VjMjY1ZDFkMmJmODEwODJiY2I2ODk0NTRiMWU0OWYyOGRiMDJl
+    OTk4ZGIwMTkzYTI3OWQzZGQwZDFkZWIyZDI5MDQyZTNiZTY1ZmQ=
   data.tar.gz: !binary |-
-    YWIzMWYyZDY4OWUyNTNmNDcxODJkYWJkNzA0NjUzZmY1YTIwNGIyYjY4MzI5
-    YWI5YzYzY2JlYjM3Y2MwYTBiMzkwODRhNDk4NzdkZjExZGEyYjRkN2ZiMGI2
-    ODQyNWFiMmViMjg3ZWEyZDQwZjIxMTYwMzIzZTdiZTdiOTZmNzk=
+    MDJjZjBkNGFjYWI3Y2I2YWRhNmQzMzk3Y2JiNWU0YzQyYzlkNzMyNDc0Yzky
+    MjYzYjAwZTYyN2NmYTJhOWY1Y2ViNDQwNjZlYjBlMjM1ZjVhZjk4OTQwMGYy
+    YzUzZWNjMDQzZWVkMDQ2ZmMzODYyMDkwNDM3NTdjNjMxZWJhODE=

data/lib/staccato/rack.rb

@@ -1,42 +1,81 @@
 require 'staccato/rack/version'
 require 'staccato'
 require 'rack/request'
+require 'ostruct'
 
 module Staccato
   module Rack
     # middleware
     class Middleware
+      # page view wrapper
+      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_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)
+        end
+
+        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 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
+
       attr_accessor :last_hit
 
       def initialize(app, tracking_id)
         @app = app
-        @tracker = Staccato.tracker(tracking_id)
+        @tracking_id = tracking_id
+        @default_tracker = Staccato.tracker(tracking_id)
       end
 
       def call(env)
-        # First, call `@app`
-        load_staccato_into_env(env)
+        env['staccato.pageview'] = PageView.new
 
-        # @last_hit = nil
+        @last_hit = nil
         status, headers, body  = @app.call(env)
 
-        env['staccato.tracker'].track(env['staccato.pageview'].params) if (200..299).include?(status.to_i)
+        if (200..299).include?(status.to_i)
+          @last_hit = env['staccato.pageview'].track!(@default_tracker, @tracking_id, ::Rack::Request.new(env))
+        end
 
         # return result
         [status, headers, body]
       end
-
-      private
-
-      def load_staccato_into_env(env)
-        request = ::Rack::Request.new(env)
-        env['staccato.tracker'] = @tracker
-        env['staccato.pageview'] = Staccato::Pageview.new(@tracker,
-                                                          path: request.fullpath,
-                                                          hostname: request.host,
-                                                          user_agent: request.env['HTTP_USER_AGENT'],
-                                                          user_ip: request.ip)
-      end
     end
   end
 end

data/lib/staccato/rack/version.rb

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

data/staccato-rack.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '>= 0.8.0'
   spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'rack-test'
-  spec.add_development_dependency 'bundler', '~> 1.8'
+  spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staccato-rack
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Grant Speelman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement