better_record 0.12.5 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1470dbdca165e377c201cff485547bc40e23c97cfad90041c232293bb2aa72c7
-  data.tar.gz: b6b8d88d04fd452691d8feafc07c623ffcbb3440c4b75aff8e5005f702ac54be
+  metadata.gz: 21977d959c121c40a33fba8d9ce2672e542c591c9140c56e1f8252441eb82260
+  data.tar.gz: 758ad406a6f5527c615fb79f3f0a7d273962a05808ac13d504d21bb7e063cab3
 SHA512:
-  metadata.gz: 0db2c6f37a2e504f395f34d16318bc8304611e160cec0175da6d1b66ae2f57e9105257939223071a124c5628a2b018e22f58f5820ec4f2c920e04095c1530b26
-  data.tar.gz: 800207491ed76785907cb171e14796a3b02814e798a34f51c83a56ecc816fcf0fcbf06dc71db8d9246df7e8db990c232d8d22474e79a0b92ae08270cfb5c6b7b
+  metadata.gz: 8cb7081304de5466efcb5717a4a20baec1591bdc68ef92566cfd00ac426b880f93b1b142d458f40e2f8f8f1ede9b098629681ff4a1d5db87ca27c77a41433966
+  data.tar.gz: 151b00bf0f2fcf80ec0b36d794b95c823442bef76d842b49c94f6c162d35abfab3abc0bffb54c6cd7bbdb93beacb9949966ddf6f19e8ecade041bf81b57ab995

data/app/models/better_record/current.rb

@@ -33,7 +33,15 @@ module BetterRecord
     end
 
     def self.user_type
-      BetterRecord::PolymorphicOverride.polymorphic_value(self.user.class) if self.user
+      self.user ? BetterRecord::PolymorphicOverride.polymorphic_value(self.user.class) : 'NULL'
+    end
+
+    def self.user_id
+      self.user ? user.id : 'NULL'
+    end
+
+    def self.user_ip
+      self.ip_address ? "'#{self.ip_address}'" : 'NULL'
     end
 
     # == Boolean Methods ======================================================

data/lib/better_record/concerns/active_record_extensions/base_extensions.rb

@@ -42,6 +42,14 @@ module BetterRecord
         BetterRecord::Current.user_type
       end
 
+      def current_user_id
+        BetterRecord::Current.user_id
+      end
+
+      def current_user_ip
+        BetterRecord::Current.user_ip
+      end
+
       def default_print
         column_names
       end
@@ -90,29 +98,25 @@ module BetterRecord
 
       def transaction(*args)
         super(*args) do
-          if BetterRecord::Current.user
-            ip = BetterRecord::Current.ip_address ? "'#{BetterRecord::Current.ip_address}'" : 'NULL'
-
-            ActiveRecord::Base.connection.execute <<-SQL
-              CREATE TEMP TABLE IF NOT EXISTS
-                "_app_user" (user_id integer, user_type text, ip_address inet);
-
-              UPDATE
-                _app_user
-              SET
-                user_id=#{BetterRecord::Current.user.id},
-                user_type='#{current_user_type}',
-                ip_address=#{ip};
-
-              INSERT INTO
-                _app_user (user_id, user_type, ip_address)
-              SELECT
-                #{BetterRecord::Current.user.id},
-                '#{current_user_type}',
-                #{ip}
-              WHERE NOT EXISTS (SELECT * FROM _app_user);
-            SQL
-          end
+          ActiveRecord::Base.connection.execute <<-SQL
+            CREATE TEMP TABLE IF NOT EXISTS
+              "_app_user" (user_id integer, user_type text, ip_address inet);
+
+            UPDATE
+              _app_user
+            SET
+              user_id=#{current_user_id},
+              user_type='#{current_user_type}',
+              ip_address=#{current_user_ip};
+
+            INSERT INTO
+              _app_user (user_id, user_type, ip_address)
+            SELECT
+              #{current_user_id},
+              '#{current_user_type}',
+              #{current_user_ip}
+            WHERE NOT EXISTS (SELECT * FROM _app_user);
+          SQL
 
           yield
         end

data/lib/better_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BetterRecord
-  VERSION = '0.12.5'
+  VERSION = '0.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails