meter 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaae4861f57d4348bb84f6985ecccac661f52f7c
-  data.tar.gz: 6fd3a087063b7473b7d7956e07f25b19db992137
+  metadata.gz: df9faee203f427e1f2f643edefea1b5b3ff3ac30
+  data.tar.gz: dd45228ac7f2b8130aca58cd203ad6d3a91c768e
 SHA512:
-  metadata.gz: 39c12fa91c7b93589e16c34dd18cfed3883ea04be497f033f20989b24bf48d766af8c385ffa10391dd8a92e276a204a1d9e0740d58a6846250d01e98c52f4bf3
-  data.tar.gz: ce3b6fcd2302dd03d0aac2994d0b3ff58dca87bcafd4ce9c631929ab12c563a31bfe9a84331352bccf90ba9720619bb3efc0ce5b1a7af2efc844faf45a77709e
+  metadata.gz: 8dcfd251841b8493a0c42a0a91d0f162a1e0d4adf0fbcd7e25eaf249e4ae4467b5aef4adf6ae310f337f4afe5f44b16ffeb222e396abe586aa9b16e1054bd36e
+  data.tar.gz: 0919517568a175fb40118da8f120568cdb012ae8197e55fa6d22f1709c16c5a22b58f06b4ac756dca31a33e50786b0b9955a551bc5b103ac82b5be7cddb7c3a1

data/lib/meter/rails/middleware.rb

@@ -1,3 +1,4 @@
+require 'useragent'
 module Meter
   module Rails
     class Middleware
@@ -6,10 +7,33 @@ module Meter
       end
 
       def call(env)
+        request = Rack::Request.new(env)
+        Meter::MDC.data['request_id'] = env['action_dispatch.request_id']
+        Meter::MDC.data['pid']        = Process.pid
+        Meter::MDC.data['ip']         = request.ip.presence || '?'
+
+        store_user_agent_data(request)
+        store_geoip_data(request)
+
         @app.call(env)
       ensure
         Meter::MDC.clear!
       end
+
+      def store_user_agent_data(request)
+        user_agent = UserAgent.parse(request.user_agent)
+        Meter::MDC.tags['user_agent_name']     = user_agent.browser
+        Meter::MDC.tags['user_agent_version']  = "#{user_agent.browser}_#{user_agent.version}"
+        Meter::MDC.tags['user_agent_platform'] = user_agent.platform
+        Meter::MDC.data['user_agent']          = user_agent.to_s
+      end
+
+      def store_geoip_data(request)
+        return unless defined?(Locality)
+        lookup = Locality::IP.new request.ip
+        Meter::MDC.tags['geoip_city']    = lookup.city_name
+        Meter::MDC.tags['geoip_country'] = lookup.country_name
+      end
     end
   end
 end

data/lib/meter/version.rb

@@ -2,7 +2,7 @@ module Meter
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: meter
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - bukowskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: useragent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement