staccato-rack 0.3.2 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjlmYTEyODk5YWM2NWVhYjMxMGViZjRkMDY4MTZlMjNjYmQzZGRjYw==
+    ODkzYjE2ZmI0MmZkNzNmY2Q0ODQ3ZmRhYWVkOTZkYTE1ZjRjNzBiMQ==
   data.tar.gz: !binary |-
-    Yzg1YWQyODM4YmRhOThjMTFhODhjY2IyNWZjMzVmNzdkOWMxMzdmNw==
+    ZDkzNTA5MjMxNjY2YjQ0ZDcxYWFiNWFkNGU4OGYzZDIxYWY0MjJkNQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGQxZTc2MjQwNzNiMzMzZmQ0OTNlNWIxMTU4Y2ExODhlN2EzOTgzNzAyNGJj
-    YjA4ODg3YTQ3MTFiMmViMjc0ODVjNTcxNTMyODg4Mzk5MmM4MThmZmVlYWNk
-    MTJiNjk5MmU0YThmNTcyYWIxZWQzYTg3MGJlZjU0Y2ZlNDU3NDc=
+    YWZmYjYwMTBiNzQxZjFiMDdhMmYyMDE2MzU3NjA1NzM1OGUxZmNhMTA4ODM5
+    MTM1ZDdmNjNiNGIwODVlYmQ5MDUwNjhhMjA2ZGVjOWI1ZTMzYjdiNjVkOWM0
+    MGE5ZDRhOGExNjUzYmM0OTk3OGJlNjdmMzY2ZDk5NTQ1MGQ3OTI=
   data.tar.gz: !binary |-
-    M2ZiNjg4ZmRmZjY3ZDA2Y2E0ZjNlMWFmMWQ3NjEyNmNmNTY5OWQ2MWIzMmMx
-    NjA4NjdlNDgzMThjZTEzNDIzOTFmMTEyY2E4ODZjNjMzODhlYzgwYThmZDI0
-    ZGFmM2RlYmFkZDRkNTVhNDQwNmExNjYwZjAyY2EzNzgwNmE4ODk=
+    NjhkNjlhNDMwN2YyYzlkZDgzYTA4MTYyMGQ2NGRiODNiMzM0YWFmNTZjNjAz
+    ZTEyNGUxN2ZmNmI4Y2JlM2Q0NjI1MjFlZGVlYTdiYTNmMDlmYjViMTg1MzVj
+    OTEzYTNkMDUyNzU4ODM0Yzk1NjI3ZGU5YWFjODQ0NzZjZWUzNjY=

data/lib/staccato/rack.rb

@@ -1,68 +1,13 @@
-require 'staccato/rack/version'
-require 'staccato'
+require 'logger'
 require 'rack/request'
-require 'ostruct'
+require 'staccato'
+
+require 'staccato/rack/version'
+require 'staccato/rack/faraday_http_adapter'
+require 'staccato/rack/page_view'
 
 module Staccato
   module Rack
-    # Proxy Class to do page views
-    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, { path: request.fullpath,
-                                                user_agent: request.env['HTTP_USER_AGENT'],
-                                                user_ip: request.ip }.merge(page_view_params))
-        add_custom_to_hit(hit)
-        r = hit.track!
-        log_response(r, hit)
-        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
-
-      def log_response(r, hit)
-        logger.info "GA Tracking: #{hit.params.inspect} => #{r.response.code if r}"
-      end
-    end
-
-    # Null Logger clas
-    class NullLogger
-      def info(*)
-      end
-    end
-
     # middleware
     class Middleware
       # page view wrapper
@@ -72,8 +17,10 @@ module Staccato
       def initialize(app, tracking_id, options = {})
         @app = app
         @tracking_id = tracking_id
-        @default_tracker = Staccato.tracker(tracking_id)
-        @logger = options[:logger] || NullLogger.new
+        @logger = options[:logger]
+        @default_tracker = Staccato.tracker(tracking_id) do |c|
+          c.adapter = FaradayHttpAdaper.new(@logger)
+        end
       end
 
       def call(env)

data/lib/staccato/rack/faraday_http_adapter.rb

@@ -0,0 +1,27 @@
+require 'faraday'
+
+module Staccato
+  module Rack
+    # Proxy Class to do page views
+    class FaradayHttpAdaper
+      def initialize(logger = nil)
+        @logger = logger
+        @conn = Faraday.new(url: 'https://ssl.google-analytics.com') do |faraday|
+          faraday.request :url_encoded             # form-encode POST params
+          faraday.response :logger, @logger if @logger
+          faraday.adapter Faraday.default_adapter  # make requests with Net::HTTP
+        end
+      end
+
+      def post(data)
+        Thread.new(data) do |body_data|
+          @conn.post do |req|
+            req.url '/collect'
+            req.options.timeout = 1           # open/read timeout in seconds
+            req.body = body_data
+          end
+        end
+      end
+    end
+  end
+end

data/lib/staccato/rack/page_view.rb

@@ -0,0 +1,54 @@
+require 'ostruct'
+
+module Staccato
+  module Rack
+    # Proxy Class to do page views
+    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]) do |c|
+            c.adapter = FaradayHttpAdaper.new(logger)
+          end
+        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, { path: request.fullpath,
+                                                user_agent: request.env['HTTP_USER_AGENT'],
+                                                user_ip: request.ip }.merge(page_view_params))
+        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
+  end
+end

data/lib/staccato/rack/version.rb

@@ -2,6 +2,6 @@
 module Staccato
   # rack module
   module Rack
-    VERSION = '0.3.2'
+    VERSION = '0.4.0'
   end
 end

data/staccato-rack.gemspec

@@ -20,10 +20,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rack'
-  spec.add_dependency 'staccato'
+  spec.add_dependency 'staccato', '>= 0.3.0'
+  spec.add_dependency 'faraday'
 
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'minitest', '>= 0.8.0'
+  spec.add_development_dependency 'rr'
+  spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'bundler', '~> 1.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staccato-rack
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Grant Speelman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -26,6 +26,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: staccato
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -66,6 +80,34 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +183,8 @@ files:
 - bin/console
 - bin/setup
 - lib/staccato/rack.rb
+- lib/staccato/rack/faraday_http_adapter.rb
+- lib/staccato/rack/page_view.rb
 - lib/staccato/rack/version.rb
 - staccato-rack.gemspec
 homepage: https://github.com/unboxed/staccato-rack