better_record 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4e3bcdf03926a87f91b4b0b55b8c34f686142904671b0434ae92fec0e4a5ced
-  data.tar.gz: 1a87533db8f024b44e0cc0c159ecd8392d91c96ee66094b51f7dedc606ea10e1
+  metadata.gz: fdba9a47098a0a01e86fcaebd7c82c5d2c896dec9b8d7df67c3235f26c94b495
+  data.tar.gz: a05cbc82c831fbf2d063355afe66c66bf4404432af3e78c89baf625f1eba530d
 SHA512:
-  metadata.gz: ad743dbfece1c278d146ae8bffdc8ae9d924f97b8214e13834f1161a0bb49b5fd4dcc52487d7aacc0b8263660eb34ced8fc460d374f2622789f272dc49e8dcf4
-  data.tar.gz: 1deddcfcb7b45e90cfdef429b0413db7e1d35685524c09a8c1c375d604a7706748a36b7f4cf8dbbcf22bb18c7fc3c6a802a377d188c9013f85509054f5afa355
+  metadata.gz: 294de3be50905c60b2ccfa414a1a3d362d46b7ce9a1dd088581c7d4069eed8bfe85685aab234893bd793aea2dc0d1a9f4b437d2617b59398a12ccb54985598e0
+  data.tar.gz: 4f7e75b61f6831e27fe088c04aea60918ffbf019dfa823bdadb0e33e4508c54239a4856ff18e9b5f7dcf11a351febbc5c3526482ab9a6c9b81fc30d28854e1df

data/app/models/better_record/base.rb

@@ -9,157 +9,23 @@ module BetterRecord
     # == Extensions ===========================================================
 
     # == Relationships ========================================================
-
+    if (ha = BetterRecord.has_auditing_relation_by_default)
+      has_many self.audit_relation_name,
+        class_name: 'BetterRecord::LoggedAction',
+        primary_type: :table_name,
+        foreign_key: :row_id,
+        foreign_type: :table_name,
+        as: self.audit_relation_name
+    end
     # == Validations ==========================================================
-    before_validation :set_booleans
 
     # == Scopes ===============================================================
 
     # == Callbacks ============================================================
 
     # == Class Methods ========================================================
-    def self.audit_relation_name
-      @@audit_relation_name ||= (BetterRecord.audit_relation_name.presence || :audits).to_sym
-    end
-
-    def self.boolean_columns
-      []
-    end
-
-    def self.column_comments(prefix = '')
-      longest_name = 0
-      column_names.each {|nm| longest_name = nm.length if nm.length > longest_name}
-      longest_name += 1
-      str = ''
-      columns.each do |col|
-        unless col.name == 'id'
-          spaces = "#{' ' * (longest_name - col.name.length)}"
-          is_required = "#{col.null == false ? ', required' : ''}"
-          is_default = "#{col.default ? ", default: #{col.default}" : ''}"
-          str << "#{prefix}##{spaces}#{col.name}: :#{col.type}#{is_required}\n"
-        end
-      end
-      str
-    end
-
-    def self.default_print
-      column_names
-    end
-
-    def self.find_or_retry_by(*args)
-      found = nil
-      retries = 0
-      begin
-        raise ActiveRecord::RecordNotFound unless found = find_by(*args)
-        return found
-      rescue
-        sleep retries += 1
-        retry if (retries) < 5
-      end
-      found
-    end
-
-    def self.queue_adapter_inline?
-      @@queue_adapter ||= Rails.application.config.active_job.queue_adapter
-      @@queue_adapter == :inline
-    end
-
-    def self.table_name_has_schema?
-      @@table_name_has_schema ||= (table_name =~ /\w+\.\w+/)
-    end
-
-    def self.table_name_without_schema
-      @@table_name_without_schema ||= (table_name =~ /\w+\.\w+/) ? table_name.split('.').last : table_name
-    end
-
-    def self.table_schema
-      @@table_schema ||= table_name_has_schema? ? table_name.split('.').first : 'public'
-    end
-
-    def self.table_size
-      BetterRecord::TableSize.unscoped.find_by(name: table_name_without_schema, schema: table_schema)
-    end
-
-    def self.transaction(*args)
-      super(*args) do
-        if Current.user
-          ip = Current.ip_address ? "'#{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=#{Current.user.id},
-              user_type='#{Current.user.class.to_s}',
-              ip_address=#{ip};
-
-            INSERT INTO
-              _app_user (user_id, user_type, ip_address)
-            SELECT
-              #{Current.user.id},
-              '#{Current.user.class.to_s}',
-              #{ip}
-            WHERE NOT EXISTS (SELECT * FROM _app_user);
-          SQL
-        end
-
-        yield
-      end
-    end
 
     # == Instance Methods =====================================================
-    def queue_adapter_inline?
-      self.class.queue_adapter_inline?
-    end
-
-    %w(path url).each do |cat|
-      self.__send__ :define_method, :"rails_blob_#{cat}" do |*args|
-        Rails.application.routes.url_helpers.__send__ :"rails_blob_#{cat}", *args
-      end
-    end
 
-    def purge(attached)
-      attached.__send__ queue_adapter_inline? ? :purge : :purge_later
-    end
-
-    def boolean_columns
-      self.class.boolean_columns
-    end
-
-    def default_print
-      self.class.default_print
-    end
-
-    private
-      # def table_name_has_schema?
-      #   self.class.table_name_has_schema?
-      # end
-      #
-      # def table_schema
-      #   self.class.table_schema
-      # end
-      #
-      # def table_name_without_schema
-      #   self.class.table_name_without_schema
-      # end
-
-      def set_booleans
-        self.class.boolean_columns.each do |nm|
-          self.__send__("#{nm}=", __send__("#{nm}=", !!Boolean.parse(__send__ nm)))
-        end
-        true
-      end
-
-    if (ha = BetterRecord.has_audits_by_default)
-      has_many self.audit_relation_name,
-        class_name: 'BetterRecord::LoggedAction',
-        primary_type: :table_name,
-        foreign_key: :row_id,
-        foreign_type: :table_name,
-        as: self.audit_relation_name
-    end
   end
 end

data/config/initializers/concerns.rb

@@ -0,0 +1,3 @@
+Dir.glob(BetterRecord::Engine.root.join('lib', 'better_record', 'concerns', '**', '*.rb')).each do |d|
+  require d
+end

data/lib/better_record.rb

@@ -1,19 +1,23 @@
 require "active_support"
 require "active_record"
 
+Dir.glob("#{File.expand_path(__dir__)}/core_ext/*.rb").each do |d|
+  require d
+end
+
 module BetterRecord
   class << self
     attr_accessor :default_polymorphic_method,
                   :db_audit_schema,
-                  :has_audits_by_default,
+                  :has_auditing_relation_by_default,
                   :audit_relation_name,
                   :layout_template,
                   :app_domain_name
   end
   self.default_polymorphic_method = (ENV.fetch('BR_DEFAULT_POLYMORPHIC_METHOD') { :polymorphic_name }).to_sym
   self.db_audit_schema = ENV.fetch('BR_DB_AUDIT_SCHEMA') { 'auditing' }
-  self.has_audits_by_default = ActiveRecord::Type::Boolean.new.cast(ENV.fetch('BR_ADD_HAS_MANY') { false })
-  self.audit_relation_name = (ENV.fetch('BR_AUDIT_RELATION_NAME') { 'audits' }).to_sym
+  self.has_auditing_relation_by_default = ActiveRecord::Type::Boolean.new.cast(ENV.fetch('BR_ADD_HAS_MANY') { true })
+  self.audit_relation_name = (ENV.fetch('BR_AUDIT_RELATION_NAME') { 'logged_actions' }).to_sym
   self.layout_template = (ENV.fetch('BR_LAYOUT_TEMPLATE') { 'better_record/layout' }).to_s
   self.app_domain_name = (ENV.fetch('APP_DOMAIN_NAME') { 'non_existant_domain.com' }).to_s
 end

data/{config/initializers/active_record/associations.rb → lib/better_record/concerns/active_record_extensions/associations_extensions/association_scope_extensions.rb}

@@ -1,24 +1,30 @@
-module ActiveRecord
-  module Associations
-    class AssociationScope #:nodoc:
-      def self.get_bind_values(owner, chain)
-        binds = []
-        last_reflection = chain.last
+require 'active_support/concern'
+require 'active_record/associations'
+require 'active_record/associations/association_scope'
 
-        binds << last_reflection.join_id_for(owner)
-        if last_reflection.type
-          binds << BetterRecord::PolymorphicOverride.polymorphic_value(owner.class, last_reflection.options.presence)
-        end
+module BetterRecord
+  module AssociationsExtensions
+    module AssociationScopeExtensions
+      extend ActiveSupport::Concern
 
-        chain.each_cons(2).each do |reflection, next_reflection|
-          if reflection.type
-            binds << BetterRecord::PolymorphicOverride.polymorphic_value(next_reflection.klass, (reflection.options[:primary_type].present? ? reflection.options : next_reflection.options))
+      included do
+        def self.get_bind_values(owner, chain)
+          binds = []
+          last_reflection = chain.last
+
+          binds << last_reflection.join_id_for(owner)
+          if last_reflection.type
+            binds << BetterRecord::PolymorphicOverride.polymorphic_value(owner.class, last_reflection.options.presence)
+          end
+
+          chain.each_cons(2).each do |reflection, next_reflection|
+            if reflection.type
+              binds << BetterRecord::PolymorphicOverride.polymorphic_value(next_reflection.klass, (reflection.options[:primary_type].present? ? reflection.options : next_reflection.options))
+            end
           end
+          binds
         end
-        binds
-      end
 
-      private
         def last_chain_scope(scope, reflection, owner)
           join_keys = reflection.join_keys
           key = join_keys.key
@@ -36,6 +42,7 @@ module ActiveRecord
           scope
         end
 
+
         def next_chain_scope(scope, reflection, next_reflection)
           join_keys = reflection.join_keys
           key = join_keys.key
@@ -52,31 +59,9 @@ module ActiveRecord
 
           scope.joins!(join(foreign_table, constraint))
         end
-    end
-
-    module Builder
-      class Association
-        def self.valid_options(options)
-          VALID_OPTIONS + [ :primary_type, :strict_primary_type ] + Association.extensions.flat_map(&:valid_options)
-        end
       end
     end
-
-    class BelongsToPolymorphicAssociation < BelongsToAssociation
-      def klass
-        type = owner[reflection.foreign_type]
-        type.presence && type.capitalize.singularize.constantize
-      end
-
-      private
-        def replace_keys(record)
-          super
-          owner[reflection.foreign_type] = record ? get_type_value(record) : nil
-        end
-
-        def get_type_value(record)
-          BetterRecord::PolymorphicOverride.polymorphic_value(record.class, reflection.options)
-        end
-    end
   end
 end
+
+ActiveRecord::Associations::AssociationScope.send(:include, BetterRecord::AssociationsExtensions::AssociationScopeExtensions)

data/lib/better_record/concerns/active_record_extensions/associations_extensions/belongs_to_polymorphic_extensions.rb

@@ -0,0 +1,29 @@
+require 'active_support/concern'
+require 'active_record/associations'
+require 'active_record/associations/belongs_to_polymorphic_association'
+
+module BetterRecord
+  module AssociationsExtensions
+    module BelongsToPolymorphicAssociationExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        def klass
+          type = owner[reflection.foreign_type]
+          type.presence && type.capitalize.singularize.constantize
+        end
+
+        def replace_keys record
+          super
+          owner[reflection.foreign_type] = record ? get_type_value(record) : nil
+        end
+
+        def get_type_value record
+          BetterRecord::PolymorphicOverride.polymorphic_value(record.class, reflection.options)
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Associations::BelongsToPolymorphicAssociation.send(:include, BetterRecord::AssociationsExtensions::BelongsToPolymorphicAssociationExtensions)

data/lib/better_record/concerns/active_record_extensions/associations_extensions/builder_extensions/association_extensions.rb

@@ -0,0 +1,25 @@
+require 'active_support/concern'
+require 'active_record/associations'
+require 'active_record/associations/builder/association'
+
+module BetterRecord
+  module AssociationsExtensions
+    module BuilderExtensions
+      module AssociationExtensions
+        extend ActiveSupport::Concern
+
+        included do |k_to_override|
+          class << k_to_override
+            alias_method :og_valid_options, :valid_options
+
+            def valid_options(options)
+              og_valid_options(options) + [ :primary_type, :strict_primary_type ]
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Associations::Builder::Association.send(:include, BetterRecord::AssociationsExtensions::BuilderExtensions::AssociationExtensions)

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

@@ -0,0 +1,160 @@
+require 'active_support/concern'
+require 'active_record/base'
+
+module BetterRecord
+  module BaseExtensions
+    extend ActiveSupport::Concern
+
+    included do
+      before_validation :set_booleans
+    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
+
+      def boolean_columns
+        []
+      end
+
+      def column_comments(prefix = '')
+        longest_name = 0
+        column_names.each {|nm| longest_name = nm.length if nm.length > longest_name}
+        longest_name += 1
+        str = ''
+        columns.each do |col|
+          unless col.name == 'id'
+            spaces = "#{' ' * (longest_name - col.name.length)}"
+            is_required = "#{col.null == false ? ', required' : ''}"
+            is_default = "#{col.default ? ", default: #{col.default}" : ''}"
+            str << "#{prefix}##{spaces}#{col.name}: :#{col.type}#{is_required}\n"
+          end
+        end
+        str
+      end
+
+      def default_print
+        column_names
+      end
+
+      def find_or_retry_by(*args)
+        found = nil
+        retries = 0
+        begin
+          raise ActiveRecord::RecordNotFound unless found = find_by(*args)
+          return found
+        rescue
+          sleep retries += 1
+          retry if (retries) < 5
+        end
+        found
+      end
+
+      def queue_adapter_inline?
+        @@queue_adapter ||= Rails.application.config.active_job.queue_adapter
+        @@queue_adapter == :inline
+      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'
+
+            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.class.to_s}',
+                ip_address=#{ip};
+
+              INSERT INTO
+                _app_user (user_id, user_type, ip_address)
+              SELECT
+                #{Current.user.id},
+                '#{Current.user.class.to_s}',
+                #{ip}
+              WHERE NOT EXISTS (SELECT * FROM _app_user);
+            SQL
+          end
+
+          yield
+        end
+      end
+    end
+
+
+    # == Instance Methods =====================================================
+    def queue_adapter_inline?
+      self.class.queue_adapter_inline?
+    end
+
+    %w(path url).each do |cat|
+      self.__send__ :define_method, :"rails_blob_#{cat}" do |*args|
+        Rails.application.routes.url_helpers.__send__ :"rails_blob_#{cat}", *args
+      end
+    end
+
+    def purge(attached)
+      attached.__send__ queue_adapter_inline? ? :purge : :purge_later
+    end
+
+    def boolean_columns
+      self.class.boolean_columns
+    end
+
+    def default_print
+      self.class.default_print
+    end
+
+    private
+      # def table_name_has_schema?
+      #   self.class.table_name_has_schema?
+      # end
+      #
+      # def table_schema
+      #   self.class.table_schema
+      # end
+      #
+      # def table_name_without_schema
+      #   self.class.table_name_without_schema
+      # end
+
+      def set_booleans
+        self.class.boolean_columns.each do |nm|
+          self.__send__("#{nm}=", __send__("#{nm}=", !!Boolean.parse(__send__ nm)))
+        end
+        true
+      end
+  end
+end
+
+ActiveRecord::Base.send(:include, BetterRecord::BaseExtensions)

data/{config/initializers/active_record/reflection.rb → lib/better_record/concerns/active_record_extensions/reflection_extensions.rb}

@@ -1,3 +1,5 @@
+require 'active_record/reflection'
+
 module ActiveRecord
   module Reflection
     class AbstractReflection

data/lib/better_record/polymorphic_override.rb

@@ -6,6 +6,7 @@ module BetterRecord
       begin
         type_val = klass.__send__(type_method)
       rescue
+        puts type_method, klass, type_val
         if type_val == :table_name_without_schema
           type_val = klass.table_name
         else
@@ -21,7 +22,8 @@ module BetterRecord
 
     def self.all_types(klass)
       keys = [ :polymorphic_name, :table_name ]
-      key |= [BetterRecord.default_polymorphic_method] if BetterRecord.default_polymorphic_method.present?
+      keys |= [BetterRecord.default_polymorphic_method] if BetterRecord.default_polymorphic_method.present?
+      p keys
       values = []
       keys.each do |k|
         val = nil

data/lib/better_record/version.rb

@@ -1,3 +1,3 @@
 module BetterRecord
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

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

@@ -4,7 +4,7 @@ module BetterRecord
   #                                                                #
   #   default_polymorphic_method: BR_DEFAULT_POLYMORPHIC_METHOD    #
   #              db_audit_schema: BR_DB_AUDIT_SCHEMA               #
-  #        has_audits_by_default: BR_ADD_HAS_MANY                  #
+  #        has_auditing_relation_by_default: BR_ADD_HAS_MANY                  #
   #          audit_relation_name: BR_AUDIT_RELATION_NAME           #
   #              layout_template: BR_LAYOUT_TEMPLATE               #
   #              app_domain_name: APP_DOMAIN_NAME                  #
@@ -23,7 +23,7 @@ module BetterRecord
   # uncomment the following line to add an association for table audits
   # directly to ActiveRecord::Base. DEFAULT - false
 
-  # self.has_audits_by_default = true
+  # self.has_auditing_relation_by_default = true
 
   # uncomment the following line to change the association name for
   # auditing lookups. DEFAULT - :audits

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Sampson Crowley
@@ -171,9 +171,8 @@ files:
 - app/views/better_record/table_sizes/index.html.erb
 - app/views/better_record/table_sizes/show.html.erb
 - app/views/layouts/better_record/application.html.erb
-- config/initializers/active_record/associations.rb
 - config/initializers/active_record/money_type.rb
-- config/initializers/active_record/reflection.rb
+- config/initializers/concerns.rb
 - config/initializers/core_ext/boolean.rb
 - config/initializers/core_ext/date.rb
 - config/initializers/core_ext/integer.rb
@@ -189,6 +188,11 @@ files:
 - db/postgres-audit-trigger.psql
 - lib/better_record.rb
 - lib/better_record/batches.rb
+- lib/better_record/concerns/active_record_extensions/associations_extensions/association_scope_extensions.rb
+- lib/better_record/concerns/active_record_extensions/associations_extensions/belongs_to_polymorphic_extensions.rb
+- lib/better_record/concerns/active_record_extensions/associations_extensions/builder_extensions/association_extensions.rb
+- lib/better_record/concerns/active_record_extensions/base_extensions.rb
+- lib/better_record/concerns/active_record_extensions/reflection_extensions.rb
 - lib/better_record/engine.rb
 - lib/better_record/fake_redis.rb
 - lib/better_record/migration.rb