remark_analytics 1.0.9 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02e980ed5f045b1cdffd0934d083c2bc468f638a98000bf8fa34e251c595a8bc
-  data.tar.gz: b95f37597342ac375ce05c004da89a82ea3335f73c334ebb6c58720768f0bcbe
+  metadata.gz: '058b54841fb2844dbb60f1625d2bd10fe7a550c8f05f72c309ba1a1fcf05b121'
+  data.tar.gz: 657290674e13f42ee59a1c3a592ad0b8827624dbdbe722effcb8b501f45fec76
 SHA512:
-  metadata.gz: c6e1202408298ef536ca2d0d30b69bbe68a2d6a6b65fe236d7cf54fda75f112ef9973c8bb4135ce1bf853af06ffe9ae72062ace93bb8096a03c1c8425ba88123
-  data.tar.gz: d171caa2cad71bb33ccd2caf35712fd3df6e8697f9362a238328990690bcb832a55e70bed1558c9c1134a2da4e9700eebb02ef01077bbd956e047440613b388a
+  metadata.gz: 74e3a8a05adfdb301290ff1995ad76ffcbc44a1c65afc5f792f3ad02a0396eb3a11e7d599a4a1d79b7d8d67cecafbbdc9882376085c660594ee96f374b943176
+  data.tar.gz: a1d57cb885a7144c842f1c1b2a7c893ad5d5991893310c1753cd2ff394db1bb6c1f586a0ea2447138805de95d27df2208a4707a84ec7b8776b9a2de8b76de701

data/lib/remark_analytics/event.rb

@@ -15,12 +15,18 @@ module RemarkAnalytics
       result[:resource_type] = event_parameters[:resource_type].presence
       result[:resource_id] = event_parameters[:resource_id].presence
       result[:data] = event_parameters[:data].presence || {}
-      result[:application_version] = event_parameters[:application_version].presence ||
-                                     RemarkAnalytics::VERSION
+      result[:application_version] =
+        event_parameters[:application_version].presence || RemarkAnalytics::VERSION
       result[:occured_at] = event_parameters[:occured_at].presence || Time.zone.now
       result[:tenant_name] = event_parameters[:tenant_name].presence ||
-                             Rails.application.secrets.try(:REMARK_ANALYTICS_TENANT_NAME) || 
-                             VP_SETTINGS[:tenant]
+        Rails.application.secrets.try(:REMARK_ANALYTICS_TENANT_NAME)
+
+      if result[:tenant_name].blank? && Object.const_defined?('VP_SETTINGS')
+        result[:tenant_name] = VP_SETTINGS[:tenant]
+      end
+      if result[:tenant_name].blank? && class_exists?('Admin::Setting')
+        result[:tenant_name] = Admin::Setting.all[:tenant]
+      end
 
       # validate params at the other side (analytics api endoint)
       result
@@ -38,5 +44,12 @@ module RemarkAnalytics
 
       RemarkAnalytics::Jobs::PostEventJob.perform_later(event_params)
     end
+
+    def class_exists?(class_name)
+      klass = Module.const_get(class_name)
+      klass.is_a?(Class)
+    rescue NameError
+      false
+    end
   end
 end

data/lib/remark_analytics/jobs/post_event_job.rb

@@ -16,7 +16,7 @@ module RemarkAnalytics
       protected
 
       def connection
-        if Rails.application.secrets.try(:NO_REMARK_ANALYTICS)
+        if Rails.application.secrets.try(:NO_REMARK_ANALYTICS) || ENV['NO_REMARK_ANALYTICS'].present?
           return
         end
 

data/lib/remark_analytics/version.rb

@@ -1,3 +1,3 @@
 module RemarkAnalytics
-  VERSION = '1.0.9'.freeze
+  VERSION = '1.0.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remark_analytics
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.11
 platform: ruby
 authors:
 - Nick Rockx
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2023-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday