logga 2.1.2 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e701347d79260bff1bb8db40f220512a456720b66efa246de76dac9a9790bac2
-  data.tar.gz: a8b56e341270752b63f5d1195232e0ac90972d3e66bf0368561b0775ea45e99d
+  metadata.gz: 5075dc703ff0a06e13b0ca7893c668bc7da0a60bc24032697ec8175d25ba6ce3
+  data.tar.gz: 6a5242a25eaa02ce127a6af099b58e708fe020b0dc17f2ffa3e603644e69b645
 SHA512:
-  metadata.gz: 4991d4f6fb02cb56c5f3b952416fb2c58209eae7a84d65d8db9147b797cab1c40af9123d1be4e70a4b59a9d5a46247f7a1a913695558bf9d7641e76b1fcc38c0
-  data.tar.gz: ccdd5e59e29546563dc5cbba93796682dcdb07286aa91da7974d544daa41a3d43724b93d749d41b7dd5e957240f08f0b9ca062e74e22242d4c22e727dc34e799
+  metadata.gz: '032693244e4731bf72f85c44a864da4b7b3c7ae8486fd05528ec499dc2768c41343d0e507864bd8807162e96ddad396cbc387228169357910dbc9ceaeb0d3912'
+  data.tar.gz: af16e0fafb5da9d8c2c7c9b88d2e4fec44d8e0508ba101f83a6d94ee7e0b3fadf8bff5624531b7ff6e5c2ac95effb831c396f80e1c78f31673bc4c9b0e28e871

data/README.md

@@ -2,7 +2,12 @@
 
 Provides attribute logging functionality to ActiveRecord objects.
 
-[![CircleCI](https://circleci.com/gh/boxt/logga/tree/master.svg?style=svg&circle-token=f9550ac25744c292e3680638bad3d5deafb1c4e1)](https://circleci.com/gh/boxt/logga/tree/master)
+[![Gem Version](https://badge.fury.io/rb/logga.svg)](https://badge.fury.io/rb/logga)
+[![CI](https://github.com/boxt/logga/actions/workflows/ci.yml/badge.svg)](https://github.com/boxt/logga/actions/workflows/ci.yml)
+
+## Requirements
+
+* Ruby 2.7 or above
 
 ## Installation
 
@@ -26,27 +31,94 @@ gem install logga
 
 ## Usage
 
-Add this to your model:
+Add the following to your model:
 
 ```ruby
-class Order < ApplicationRecord
-  add_log_entries_for :create, :update
+class Thing < ApplicationRecord
+  # Optional author accessor. See #author
+  attr_accessor :author 
+
+  # Association to :log_entries, which the loggable object must response to for logging.
+  has_many :log_entries, as: :loggable, dependent: :destroy 
+
+  add_log_entries_for(
+    :create, # Log on object create
+    :delete, # Log on object delete
+    :update, # Log on object update
+    allowed_fields: [], # set an array of fields allowed to be logged
+    exclude_fields: [], # set an array of fields excluded from logging. Ignored if allowed_fields is set
+    fields: {}, # Custom messages for fields. See #fields
+    to: nil
+  )
 end
 ```
 
-So that new LogEntry records attached to a given Order instance will be created whenever a new one is created or
+So that new `LogEntry` records attached to a given `Thing` instance will be created whenever a new one is created or
 modified.
 
+## Author
+
+If you want to log the author of the changes you can do so by setting:
+
+```ruby
+thing.author = { id: "1", name: "Barry", type: "User" }
+```
+
+## Fields
+
+You can override the default messages per field by using:
+
+```ruby
+add_log_entries_for(
+  :update,
+  fields: {
+    name: lambda { |record, field, old_value, new_value|
+      "Name changed from #{old_value} to #{new_value}"
+    }
+  }
+)
+```
+
+This is with the exeception on `:created_at` which only takes the created record.
+
+```ruby
+add_log_entries_for(
+  :create,
+  fields: {
+    created_at: lambda { |record|
+      "Created object with id: #{record.id}"
+    }
+  }
+)
+```
+
+## Configuration
+
+Add an initializer to your project:
+
+```ruby
+Logga.configure do |config|
+  config.enabled = true
+  config.excluded_fields = [] # Default array of excluded fields i.e. [:id] to ignore all :id fields for every object
+  config.excluded_suffixes = [] # Array of excluded suffixes i.e. [:_id] to ignore all fields that end in :_id for every object
+end
+```
+
+For example:
+
+```ruby
+Logga.configure do |config|
+  config.excluded_fields = [:id] # Don't log any id changes
+  config.excluded_suffixes = [_id] # Don't log any column that ends in _id
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`.
 
-## Versioning
-
-The version of the gem should be set in the `VERSION` file found in the root of the project. This is then read by the `lib/boxt_aasm_ext/version.rb` file to set in the gem.
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/boxt/logga.
@@ -57,5 +129,5 @@ The gem is available as open source under the terms of the [MIT License](http://
 
 ## TODOs
 
-- Write some tests
 - Improve the documentation
+- Add migration generator for `:log_entries`

data/VERSION

@@ -1 +1,2 @@
-2.1.2
+4.0.2
+

data/lib/logga/active_record.rb

@@ -4,25 +4,26 @@ module Logga
   module ActiveRecord
     extend ActiveSupport::Concern
 
-    EXCLUDED_KEYS = %i[id created_at deleted_at initial updated_at log sent_after_sales_emails].freeze
-    EXCLUDED_KEYS_SUFFIXES = %i[_id _filenames].freeze
-
     included do
-      class_attribute :log_fields, instance_writer: false
+      class_attribute :allowed_fields, instance_writer: false
       class_attribute :excluded_fields, instance_writer: false
-      self.log_fields = {}
-      self.excluded_fields = {}
+      class_attribute :fields, instance_writer: false
+
+      self.allowed_fields = []
+      self.excluded_fields = []
+      self.fields = {}
     end
 
     class_methods do
-      def add_log_entries_for(*actions, to: :self, fields: {}, exclude_fields: [])
-        after_create  :log_model_creation if actions.include?(:create)
+      def add_log_entries_for(*actions, allowed_fields: [], exclude_fields: [], fields: {}, to: :self)
+        after_create :log_model_creation if actions.include?(:create)
         after_destroy :log_model_deletion if actions.include?(:delete)
-        after_update  :log_model_changes  if actions.include?(:update)
+        after_update :log_model_changes if actions.include?(:update)
         define_method(:log_receiver) { to == :self ? self : send(to) }
 
-        self.log_fields = fields
-        self.excluded_fields = Array(exclude_fields)
+        self.allowed_fields = Array(allowed_fields)
+        self.excluded_fields = allowed_fields.blank? ? Array(exclude_fields) : []
+        self.fields = fields
       end
     end
 
@@ -30,27 +31,29 @@ module Logga
       return if changes.blank?
 
       body = field_changes_to_message(changes)
-      create_log_entry(author_data.merge(body: body)) if body.present?
+      return if body.blank?
+
+      create_log_entry(author_data.merge(body: body))
     end
 
     def log_model_creation
-      return if should_not_log?
+      return unless should_log?
 
       body_generator = ->(record) { default_creation_log_body(record) }
-      body = log_fields.fetch(:created_at, body_generator).call(self)
+      body = fields.fetch(:created_at, body_generator).call(self)
       create_log_entry(author_data.merge(body: body, created_at: creation_at))
     end
 
     def log_model_deletion
-      return if should_not_log?
+      return unless should_log?
 
       body_generator = ->(record) { default_deletion_log_body(record) }
-      body = log_fields.fetch(:deleted_at, body_generator).call(self)
+      body = fields.fetch(:deleted_at, body_generator).call(self)
       create_log_entry(author_data.merge(body: body))
     end
 
     def log_model_changes
-      return if should_not_log?
+      return unless should_log?
 
       field_changes = previous_changes.reject { |k, _| reject_change?(k) }
       log_field_changes(field_changes)
@@ -60,13 +63,22 @@ module Logga
 
     def author_data
       data = Hash(log_receiver.try(:author) || try(:author)).with_indifferent_access
+
       {
         author_id: data[:id],
-        author_type: data[:type],
-        author_name: data[:name]
+        author_name: data[:name],
+        author_type: data[:type]
       }
     end
 
+    def config_excluded_fields
+      Logga.configuration.excluded_fields
+    end
+
+    def config_excluded_suffixes
+      Logga.configuration.excluded_suffixes
+    end
+
     def create_log_entry(entry)
       log_receiver&.log_entries&.create(entry)
     end
@@ -78,10 +90,7 @@ module Logga
     end
 
     def default_creation_log_body(record)
-      [
-        "#{titleized_model_class_name(record)} created",
-        ("(#{record.state})" if record.try(:state))
-      ].compact.join(" ")
+      "#{titleized_model_class_name(record)} created"
     end
 
     def default_change_log_body(record, field, _old_value, new_value)
@@ -100,19 +109,22 @@ module Logga
         default_change_log_body(record, field, old_value, new_value)
       }
       changes.inject([]) do |result, (field, (old_value, new_value))|
-        result << log_fields.fetch(field.to_sym, body_generator).call(self, field, old_value, new_value)
+        result << fields.fetch(field.to_sym, body_generator).call(self, field, old_value, new_value)
       end.compact.join("\n")
     end
 
     def reject_change?(key)
-      EXCLUDED_KEYS.include?(key.to_sym) ||
-        (!log_fields.include?(key.to_sym) &&
-         (excluded_fields.include?(key.to_sym) ||
-          EXCLUDED_KEYS_SUFFIXES.any? { |suffix| key.to_s.end_with?(suffix.to_s) }))
+      sym_key = key.to_sym
+      return allowed_fields.exclude?(sym_key) if allowed_fields.present?
+
+      config_excluded_fields.include?(sym_key) ||
+        (fields.exclude?(sym_key) &&
+         (excluded_fields.include?(sym_key) ||
+          config_excluded_suffixes.any? { |suffix| key.to_s.end_with?(suffix.to_s) }))
     end
 
-    def should_not_log?
-      !log_receiver.respond_to?(:log_entries)
+    def should_log?
+      Logga.enabled? && log_receiver.respond_to?(:log_entries)
     end
 
     def titleized_model_class_name(record)

data/lib/logga/config.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Logga
+  class Config
+    attr_accessor :enabled, :excluded_fields, :excluded_suffixes
+
+    def initialize(enabled: true, excluded_fields: [], excluded_suffixes: [])
+      @enabled = enabled
+      @excluded_fields = excluded_fields
+      @excluded_suffixes = excluded_suffixes
+    end
+  end
+end

data/lib/logga.rb

@@ -3,11 +3,37 @@
 require "active_support"
 require "active_support/core_ext"
 require "active_support/concern"
-require_relative "logga/version"
+
 require_relative "logga/active_record"
+require_relative "logga/config"
+require_relative "logga/version"
 
 module Logga
   ActiveSupport.on_load(:active_record) do
     include Logga::ActiveRecord
   end
+
+  class << self
+    def configuration
+      @configuration ||= Config.new
+    end
+
+    def configure
+      yield(configuration)
+    end
+
+    # Switches Logga on or off
+    def enabled=(value)
+      configuration.enabled = value
+    end
+
+    # Returns `true` if Logga is on, `false` otherwise
+    def enabled?
+      !!configuration.enabled
+    end
+
+    def version
+      Logga::VERSION
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logga
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 4.0.2
 platform: ruby
 authors:
 - Boxt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,138 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "~>"
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "~>"
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "~>"
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "~>"
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: boxt_ruby_style_guide
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.2.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: rspec-nc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '8'
 description: Extensions to ActiveRecord to log entries on model changes
 email:
 - developers@boxt.co.uk
@@ -161,11 +63,13 @@ files:
 - VERSION
 - lib/logga.rb
 - lib/logga/active_record.rb
+- lib/logga/config.rb
 - lib/logga/version.rb
 homepage: https://github.com/boxt/logga
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -174,14 +78,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: ActiveRecord log entries on model changes