better_record 0.23.7 → 0.25.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71e38a32a6cddd2e761dfcb4563ecdd95517356246c22c53990a903b82eb9970
-  data.tar.gz: 3ea824e4b03979ee7900562cc7a499cf85ecd5cf6aa7e1b5473fe7d692f54ef6
+  metadata.gz: 925a6e392a7e09a6a37ac206c21b744ff4302e2230f19fc103cf4dc2034f605b
+  data.tar.gz: 23d59e5cb90a4bd57941cb6098acc0f242b176bb7703418f3484ce6a80699d55
 SHA512:
-  metadata.gz: ccf1c9213deaee91558e5113ffe462d03fde05e6f3721531a41d6eca98311bb06560a95d70aaa4acb0c822197da7170bf830326fc56a959daf2d9a18648105f0
-  data.tar.gz: 40f68dc4593e6b51a8b005a65bd86d34db57643c7c948d8b067297a3173c11c57653c07c57ab832c9b6f3e0d92b75bf62366bd63c8c3122ca2bfef232d932928
+  metadata.gz: '08ce52bf923b009a567f52bb4188fb010df8dde927bd88f03b4986d6546c4c3cff2810d6e80f85acc6ef7a8b3e6dfe5795c490ba8f90fa0f71c49a17191f088b'
+  data.tar.gz: 7999a2285c92638ca80f4dcc57529d812ab83855fa364cea859ebb593b3047173db84a7db3677573888c2c07a6a0a05bead706443181b92309d5f01f6e651138

data/app/models/better_record/base.rb

@@ -29,10 +29,13 @@ module BetterRecord
         connection.execute(%Q(SELECT 1 FROM #{t_name}_#{self.table_name_only} LIMIT 1))
 
         self.const_set(:LoggedAction, Class.new(ApplicationRecord))
+        self.const_get(:LoggedAction).include(ModelConcerns::LoggedActionBase)
         self.const_get(:LoggedAction).table_name = "#{t_name}_#{self.table_name_only}"
         self.const_get(:LoggedAction).primary_key = :event_id
+        self
       rescue ActiveRecord::StatementInvalid
         self.const_set(:LoggedAction, BetterRecord::LoggedAction)
+        self
       end
 
       self.has_many self.audit_relation_name,

data/app/models/better_record/logged_action.rb

@@ -3,27 +3,15 @@
 module BetterRecord
   class LoggedAction < Base
     # == Constants ============================================================
-    ACTIONS = {
-      D: 'DELETE',
-      I: 'INSERT',
-      U: 'UPDATE',
-      T: 'TRUNCATE',
-      A: 'ARCHIVE',
-    }.with_indifferent_access
 
     # == Attributes ===========================================================
     self.table_name = "#{BetterRecord.db_audit_schema}.logged_actions_view"
     self.primary_key = :event_id
 
     # == Extensions ===========================================================
+    include ModelConcerns::LoggedActionBase
 
     # == Relationships ========================================================
-    belongs_to :audited,
-      polymorphic: :true,
-      primary_type: :table_name,
-      foreign_key: :row_id,
-      foreign_type: :table_name,
-      optional: true
 
     # == Validations ==========================================================
 
@@ -34,37 +22,10 @@ module BetterRecord
     # == Boolean Class Methods ================================================
 
     # == Class Methods ========================================================
-    def self.default_print
-      [
-        :event_id,
-        :row_id,
-        :full_name,
-        :app_user_id,
-        :app_user_type,
-        :action_type,
-        :changed_columns
-      ]
-    end
-
-    # def self.set_audits_methods!
-    #   self.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
 
     # == Boolean Methods ======================================================
 
     # == Instance Methods =====================================================
-    def changed_columns
-      (self.changed_fields || {}).keys.join(', ').presence || 'N/A'
-    end
-
-    def action_type
-      ACTIONS[action] || 'UNKNOWN'
-    end
 
   end
 end

data/app/models/better_record/model_concerns/logged_action_base.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+module BetterRecord
+  module ModelConcerns
+    module LoggedActionBase
+      extend ActiveSupport::Concern
+
+      ACTIONS = {
+        D: 'DELETE',
+        I: 'INSERT',
+        U: 'UPDATE',
+        T: 'TRUNCATE',
+        A: 'ARCHIVE',
+      }.with_indifferent_access
+
+      included do
+        belongs_to :record,
+          polymorphic: :true,
+          primary_type: :table_name,
+          foreign_key: :row_id,
+          foreign_type: :table_name,
+          optional: true
+      end
+
+      class_methods do
+        def default_print
+          [
+            :event_id,
+            :row_id,
+            :full_name,
+            :app_user_id,
+            :app_user_type,
+            :action_type,
+            :changed_columns
+          ]
+        end
+      end
+
+      def changed_columns
+        (self.changed_fields || {}).keys.join(', ').presence || 'N/A'
+      end
+
+      def action_type
+        ACTIONS[action] || 'UNKNOWN'
+      end
+    end
+  end
+end

data/app/models/better_record/table_size.rb

@@ -85,12 +85,6 @@ module BetterRecord
     # == Boolean Methods ======================================================
 
     # == Instance Methods =====================================================
-    def changed_columns
-      (self.changed_fields || {}).keys.join(', ').presence || 'N/A'
-    end
 
-    def action_type
-      ACTIONS[action] || 'UNKNOWN'
-    end
   end
 end

data/config/initializers/redis_store.rb

@@ -8,9 +8,9 @@ if defined?(Redis) && defined?(Redis::Namespace)
     tmp_rds.get('test')
   rescue
     if (!Rails.env.production? && !Boolean.parse(ENV.fetch('FORCE_REDIS') { false })) || Boolean.parse(ENV.fetch('ALLOW_FAKE_REDIS') { false })
-      require BetterRecord::Engine.root.join('lib', 'better_record', 'fake_redis')
+      raise unless defined?(TinyFakeRedis)
       puts "WARNING!!! Redis Server not found"
-      tmp_rds = BetterRecord::FakeRedis.new
+      tmp_rds = TinyFakeRedis.new
     else
       raise
     end

data/lib/better_record/polymorphic_override.rb

@@ -23,7 +23,7 @@ module BetterRecord
           $!.message, $!.backtrace if debug
 
         if type_val == :table_name_without_schema
-          type_val = klass.table_name.to_s.split('.').first
+          type_val = klass.table_name.to_s.split('.').last
         else
           type_val = klass.polymorphic_name
         end

data/lib/better_record/version.rb

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

data/lib/core_ext/array.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Array
-  def to_enum
+  def to_db_enum
     hashed = {}
     each {|v| hashed[v] = v.to_s}
     hashed

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.23.7
+  version: 0.25.2
 platform: ruby
 authors:
 - Sampson Crowley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 5.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 5.2.4
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.19
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -114,22 +114,22 @@ dependencies:
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: jwe
   requirement: !ruby/object:Gem::Requirement
@@ -154,62 +154,82 @@ dependencies:
   name: csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.2
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.2
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: tiny_fake_redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.10.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.10'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.10'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.10.0
 description: |2
     This app extends active record to allow you to change the polymorphic type value in relationships.
     It also extends active record batching functions to be able to order records while batching.
@@ -244,6 +264,7 @@ files:
 - app/models/better_record/logged_action.rb
 - app/models/better_record/model_concerns/has_protected_password.rb
 - app/models/better_record/model_concerns/has_validated_avatar.rb
+- app/models/better_record/model_concerns/logged_action_base.rb
 - app/models/better_record/table_size.rb
 - app/views/better_record/table_sizes/index.html.erb
 - app/views/better_record/table_sizes/show.html.erb
@@ -301,7 +322,6 @@ files:
 - lib/better_record/encoder.rb
 - lib/better_record/engine.rb
 - lib/better_record/exchange_rate_integer.rb
-- lib/better_record/fake_redis.rb
 - lib/better_record/gender.rb
 - lib/better_record/inject_methods.rb
 - lib/better_record/jwt.rb
@@ -345,7 +365,7 @@ homepage: https://github.com/SampsonCrowley/multi_app_active_record
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -360,8 +380,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Fix functions that are lacking in Active record to be compatible with multi-app
   databases

data/lib/better_record/fake_redis.rb

@@ -1,107 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-module BetterRecord
-  class FakeRedis
-    def data
-      @data ||= {}
-    end
-
-    def incr(key)
-      data[key] ||= 0
-      data[key] += 1
-    end
-
-    def decr(key)
-      data[key] ||= 0
-      data[key] -= 1
-    end
-
-    def set(key, val)
-      data[key] = val
-    end
-
-    def get(key)
-      data[key].dup
-    end
-
-    def lpush(key, val)
-      require_array
-      data[key].unshift val
-      data[key].size
-    end
-
-    def lrem(key, count, val)
-      require_array
-      start_idx = 0
-      arr = data[key]
-      removed = 0
-
-      if count == 0
-        removed = (arr.select {|v| v != val}).size
-        arr.select! {|v| v != val}
-      else
-        arr.reverse! if count < 0
-
-        count.abs.times do
-          removed += 1 unless arr.delete_at(arr.index(val) || arr.size).nil?
-        end
-
-        arr.reverse! if count < 0
-      end
-
-      data[key] = arr
-      removed
-    end
-
-    def lrange(key, start_idx, end_idx = -1)
-      data[key][start_idx..end_idx] || []
-    end
-
-    def rpush(key, val)
-      require_array
-      data[key] << val
-      data[key].size
-    end
-
-    def rpushx(key, val)
-      return 0 unless data[key]
-      rpush key, val
-    end
-
-    def rpop(key)
-      require_array
-      data[key].pop
-    end
-
-    def rpoplpush(one, two)
-      val = rpop(one)
-      lpush two, val
-      val
-    end
-
-    def keys(pattern = ".*")
-      data.keys.filter {|k| k.to_s =~ /^#{pattern}$/}
-    end
-
-    def del(*keys)
-      i = 0
-      keys.map {|k| data.delete(k) && (i += 1) }
-      i
-    end
-
-    def method_missing
-      return nil
-    end
-
-    private
-      def require_array(key)
-        data[key] ||= []
-        raise_wrong_type unless data[key].is_a?(Array)
-      end
-
-      def raise_wrong_type
-        raise CommandError.new("WRONGTYPE Operation against a key holding the wrong kind of value")
-      end
-  end
-end