better_record 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1e3148b716e1640ca06c7f78be79198b1ad804d36fb06f1bebe9ea6aaa06f63
-  data.tar.gz: ffa7fbe4ebab51049c781bb592799ff631df980d352b7af8d096749ebc76a58d
+  metadata.gz: 6fc69e149e9934f116d1b8a1b6acdc2d7a3feca91946efad68c8d79e9aac6db2
+  data.tar.gz: b09dc11d66083687ba54e1aa9da41381d798b621b695bf015e46567cd51152f3
 SHA512:
-  metadata.gz: e29cb8cd89960abe633cdf6b7eea7808fc7743dcad51e41b30d619c3462aa15c692c3cc07e11820b52857c6d541bfce200dba0429ad77b0108c6dea524083c48
-  data.tar.gz: 7fe66330d09156c97e8f835a8128f89222bece19c0794b17f02af1b63bc58311649145c0096ef869a1311ac6ee6fa46190d54f08b5be00d6b9224fb6b98a27e9
+  metadata.gz: 5c0e1b68ca9451c72d876f6f01e231532781af82bf44c0b58c93b31e58fd5c960be3996ec81cdc5074174b05e1693e21ee11d5bc00b8b799ef90055ce5a02016
+  data.tar.gz: ff13808fb4c58fd68694afe9d147d295bcf59ef5583105e9c66983d194ee4671eda9073670c9810fa9262497bf661af5b67d696042bbf6809f3fcc9494426374

data/app/models/better_record/current.rb

@@ -1,5 +1,19 @@
 module BetterRecord
   class Current < ActiveSupport::CurrentAttributes
     attribute :user, :ip_address
+
+    def self.user_type
+      BetterRecord::PolymorphicOverride.polymorphic_value(self.user.class) if self.user
+    end
+
+    def self.set(user, ip)
+      self.user = user.presence || nil
+      self.ip_address = ip.presence || nil
+    end
+
+    def self.drop_values
+      self.user = nil
+      self.ip_address = nil
+    end
   end
 end

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

@@ -10,26 +10,6 @@ module BetterRecord
     end
 
     class_methods do
-      def table_name_defined?
-        @table_name_defined ||= method_defined?(:table_name) || !!table_name.present?
-      end
-
-      def table_name_has_schema?
-        @table_name_has_schema ||= (table_name =~ /\w+\.\w+/)
-      end
-
-      def table_name_without_schema
-        @table_name_without_schema ||= (table_name =~ /\w+\.\w+/) ? table_name.split('.').last : table_name
-      end
-
-      def table_name_with_schema
-        @table_name_without_schema ||= "#{table_schema}.#{table_name_without_schema}"
-      end
-
-      def table_schema
-        @table_schema ||= table_name_has_schema? ? table_name.split('.').first : 'public'
-      end
-
       def audit_relation_name
         @@audit_relation_name ||= (BetterRecord.audit_relation_name.presence || :audits).to_sym
       end
@@ -54,6 +34,10 @@ module BetterRecord
         str
       end
 
+      def current_user_type
+        BetterRecord::Current.user_type
+      end
+
       def default_print
         column_names
       end
@@ -76,14 +60,34 @@ module BetterRecord
         @@queue_adapter == :inline
       end
 
+      def table_name_defined?
+        @table_name_defined ||= method_defined?(:table_name) || !!table_name.present?
+      end
+
+      def table_name_has_schema?
+        @table_name_has_schema ||= (table_name =~ /\w+\.\w+/)
+      end
+
+      def table_name_without_schema
+        @table_name_without_schema ||= (table_name =~ /\w+\.\w+/) ? table_name.split('.').last : table_name
+      end
+
+      def table_name_with_schema
+        @table_name_without_schema ||= "#{table_schema}.#{table_name_without_schema}"
+      end
+
+      def table_schema
+        @table_schema ||= table_name_has_schema? ? table_name.split('.').first : 'public'
+      end
+
       def table_size
         BetterRecord::TableSize.unscoped.find_by(name: table_name_without_schema, schema: table_schema)
       end
 
       def transaction(*args)
         super(*args) do
-          if Current.user
-            ip = Current.ip_address ? "'#{Current.ip_address}'" : 'NULL'
+          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
@@ -92,15 +96,15 @@ module BetterRecord
               UPDATE
                 _app_user
               SET
-                user_id=#{Current.user.id},
-                user_type='#{Current.user.class.to_s}',
+                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
-                #{Current.user.id},
-                '#{Current.user.class.to_s}',
+                #{BetterRecord::Current.user.id},
+                '#{current_user_type}',
                 #{ip}
               WHERE NOT EXISTS (SELECT * FROM _app_user);
             SQL

data/lib/better_record/version.rb

@@ -1,3 +1,3 @@
 module BetterRecord
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

data/lib/generators/better_record/setup/templates/current.rb

@@ -14,24 +14,35 @@ module Current
   # == Callbacks ============================================================
 
   # == Class Methods ========================================================
+
+  def self.user
+    BetterRecord::Current.user
+  end
+
   def self.user=(user)
     set_user(user)
   end
 
+  def self.ip_address
+    BetterRecord::Current.user
+  end
+
   def self.ip_address=(user)
     set_user(user)
   end
 
+  def self.user_type
+    BetterRecord::Current.user_type
+  end
+
   def self.set(user, ip)
-    BetterRecord::Current.user = user.presence || nil
-    BetterRecord::Current.ip_address = ip.presence || nil
+    BetterRecord::Current.set(user, ip)
   end
 
   def self.drop_values
-    BetterRecord::Current.user = nil
-    BetterRecord::Current.ip_address = nil
+    BetterRecord::Current.drop_values
   end
-  
+
   # == Instance Methods =====================================================
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Sampson Crowley