moesif_rack 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 818bfecddcafd4b2b71a662e762cb5468b4bf54c7fc5397fb0812ad4274b82ac
-  data.tar.gz: 96385b853df74e5a7ca95d669244fc8e744079fcfd6d109c1c7855663bd61ea8
+  metadata.gz: 0cc9c9466e539ecf7d672312b98ed2f228a6b850f7c7e315559f80e31ee937a7
+  data.tar.gz: ba2f944d8f3f19cb451c64113412780cd8141359f6473992b603fe9eddf43bac
 SHA512:
-  metadata.gz: eb421c6472805827b2f7c23442c3047ba36c34172ef9af86d2c1266e3867c5aea201cb1900b9e11c16f6915773273a366d75e2b81a0bd02676f147f432de2988
-  data.tar.gz: 557bea2a4a9e8c223bde8d2242d47c23ff69adf591ee2f55101b74f9910e788ec584aaf7b5e61942f485a2aa43bd423b6a4196094586424c217de0ded3fe36b9
+  metadata.gz: ecac64d6a6f05a347ccb9927630e3a48eda1ad75ec65d32dc23742483f311fa55b8a5d6720bfda6e7bff49146852410c80b4d6a4cae8b17917f16a4458630523
+  data.tar.gz: 630eb05009f358ee214a61e386f0e933222ebeced3ea38e158d70e3f1629351ef52ff885736f2dfb4e49dd41f8c6271ca8ca2731b17cfc363d46c52ab423b375

data/README.md

@@ -22,7 +22,7 @@ gem install moesif_rack
 and if you have a `Gemfile` in your project, please add this line to
 
 ```
-gem 'moesif_rack', '~> 1.4.0'
+gem 'moesif_rack', '~> 1.4.1'
 
 ```
 
@@ -334,7 +334,7 @@ This method is a convenient helper that calls the Moesif API lib.
 For details, visit the [Ruby API Reference](https://www.moesif.com/docs/api?ruby#update-a-user).
 
 ```ruby
-metadata => {
+metadata = {
   :email => 'john@acmeinc.com',
   :first_name => 'John',
   :last_name => 'Doe',
@@ -348,7 +348,7 @@ metadata => {
 
 # Campaign object is optional, but useful if you want to track ROI of acquisition channels
 # See https://www.moesif.com/docs/api#users for campaign schema
-campaign = CampaignModel.new()
+campaign = MoesifApi::CampaignModel.new()
 campaign.utm_source = "google"
 campaign.utm_medium = "cpc"
 campaign.utm_campaign = "adwords"
@@ -357,7 +357,7 @@ campaign.utm_content = "landing"
 
 # Only user_id is required.
 # metadata can be any custom object
-user = UserModel.new()
+user = MoesifApi::UserModel.new()
 user.user_id = "12345"
 user.company_id = "67890" # If set, associate user with a company object
 user.campaign = campaign
@@ -375,7 +375,7 @@ For details, visit the [Ruby API Reference](https://www.moesif.com/docs/api?ruby
 ```ruby
 users = []
 
-metadata => {
+metadata = {
   :email => 'john@acmeinc.com',
   :first_name => 'John',
   :last_name => 'Doe',
@@ -389,7 +389,7 @@ metadata => {
 
 # Campaign object is optional, but useful if you want to track ROI of acquisition channels
 # See https://www.moesif.com/docs/api#users for campaign schema
-campaign = CampaignModel.new()
+campaign = MoesifApi::CampaignModel.new()
 campaign.utm_source = "google"
 campaign.utm_medium = "cpc"
 campaign.utm_campaign = "adwords"
@@ -398,7 +398,7 @@ campaign.utm_content = "landing"
 
 # Only user_id is required.
 # metadata can be any custom object
-user = UserModel.new()
+user = MoesifApi::UserModel.new()
 user.user_id = "12345"
 user.company_id = "67890" # If set, associate user with a company object
 user.campaign = campaign
@@ -419,7 +419,7 @@ This method is a convenient helper that calls the Moesif API lib.
 For details, visit the [Ruby API Reference](https://www.moesif.com/docs/api?ruby#update-a-company).
 
 ```ruby
-metadata => {
+metadata = {
   :org_name => 'Acme, Inc',
   :plan_name => 'Free',
   :deal_stage => 'Lead',
@@ -432,7 +432,7 @@ metadata => {
 
 # Campaign object is optional, but useful if you want to track ROI of acquisition channels
 # See https://www.moesif.com/docs/api#update-a-company for campaign schema
-campaign = CampaignModel.new()
+campaign = MoesifApi::CampaignModel.new()
 campaign.utm_source = "google"
 campaign.utm_medium = "cpc"
 campaign.utm_campaign = "adwords"
@@ -441,7 +441,7 @@ campaign.utm_content = "landing"
 
 # Only company_id is required.
 # metadata can be any custom object
-company = CompanyModel.new()
+company = MoesifApi::CompanyModel.new()
 company.company_id = "67890"
 company.company_domain = "acmeinc.com" # If domain is set, Moesif will enrich your profiles with publicly available info 
 company.campaign = campaign
@@ -459,7 +459,7 @@ For details, visit the [Ruby API Reference](https://www.moesif.com/docs/api?ruby
 ```ruby
 companies = []
 
-metadata => {
+metadata = {
   :org_name => 'Acme, Inc',
   :plan_name => 'Free',
   :deal_stage => 'Lead',
@@ -472,7 +472,7 @@ metadata => {
 
 # Campaign object is optional, but useful if you want to track ROI of acquisition channels
 # See https://www.moesif.com/docs/api#update-a-company for campaign schema
-campaign = CampaignModel.new()
+campaign = MoesifApi::CampaignModel.new()
 campaign.utm_source = "google"
 campaign.utm_medium = "cpc"
 campaign.utm_campaign = "adwords"
@@ -481,7 +481,7 @@ campaign.utm_content = "landing"
 
 # Only company_id is required.
 # metadata can be any custom object
-company = CompanyModel.new()
+company = MoesifApi::CompanyModel.new()
 company.company_id = "67890"
 company.company_domain = "acmeinc.com" # If domain is set, Moesif will enrich your profiles with publicly available info 
 company.campaign = campaign

data/lib/moesif_rack/moesif_middleware.rb

@@ -6,6 +6,8 @@ require_relative './client_ip.rb'
 require_relative './app_config.rb'
 require_relative './update_user.rb'
 require_relative './update_company.rb'
+require 'zlib'
+require 'stringio'
 
 module MoesifRack
 
@@ -71,6 +73,39 @@ module MoesifRack
       CompanyHelper.new.update_companies_batch(@api_controller, @debug, company_profiles)
     end
 
+    def start_with_json(body)
+      body.start_with?('{') || body.start_with?('[')
+    end
+
+    def decompress_body(body)
+      Zlib::GzipReader.new(StringIO.new(body)).read
+    end
+
+    def transform_headers(headers)
+      Hash[headers.map { |k, v| [k.downcase, v]}]
+    end
+
+    def base64_encode_body(body)
+      return Base64.encode64(body), 'base64'
+    end
+
+    def parse_body(body, headers)
+      begin
+        if start_with_json(body)
+          parsed_body = JSON.parse(body)
+          transfer_encoding = 'json'
+        elsif headers.key?('content-encoding') && ((headers['content-encoding'].downcase).include? "gzip")
+          uncompressed_string = decompress_body(body)
+          parsed_body, transfer_encoding = base64_encode_body(uncompressed_string)
+        else
+          parsed_body, transfer_encoding = base64_encode_body(body)
+        end
+      rescue
+        parsed_body, transfer_encoding = base64_encode_body(body)
+      end
+      return parsed_body, transfer_encoding
+    end
+
     def call env
       start_time = Time.now.utc.iso8601
 
@@ -86,7 +121,7 @@ module MoesifRack
         complex_copy = env.dup
 
         req_headers = {}
-        complex_copy.select {|k,v| k.start_with? 'HTTP_'}.each do |key, val|
+        complex_copy.select {|k,v| k.start_with?('HTTP_', 'CONTENT_') }.each do |key, val|
           new_key = key.sub(/^HTTP_/, '')
           new_key = new_key.sub('_', '-')
           req_headers[new_key] = val
@@ -99,12 +134,7 @@ module MoesifRack
 
         if @log_body
           if req_body_string && req_body_string.length != 0
-            begin
-              req_body = JSON.parse(req_body_string)
-            rescue
-              req_body = Base64.encode64(req_body_string)
-              req_body_transfer_encoding = 'base64'
-            end
+            req_body, req_body_transfer_encoding = parse_body(req_body_string, transform_headers(req_headers))
           end
         end
 
@@ -116,12 +146,7 @@ module MoesifRack
 
         if @log_body
           if rsp_body_string && rsp_body_string.length != 0
-            begin
-              rsp_body = JSON.parse(rsp_body_string)
-            rescue
-              rsp_body = Base64.encode64(rsp_body_string)
-              rsp_body_transfer_encoding = 'base64'
-            end
+            rsp_body, rsp_body_transfer_encoding = parse_body(rsp_body_string, transform_headers(rsp_headers))
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moesif_rack
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Moesif, Inc
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit