rails_log_book 1.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33c84201892d61f332f7f60bd66ac9d052c37b9d9a894e5210eecf528efcb1ee
-  data.tar.gz: 2dd8618869a1a1955e8c24261edbd11561662792d39e736de94513ea32b28358
+  metadata.gz: 1d058f0c867c6fce846e033d8aafa907e5dd4eff98faa8e26d7c7d92781af1ba
+  data.tar.gz: a7e97c3ca16861c470646e534b11055c8a849d27838de24f39d4ee93e6ac0412
 SHA512:
-  metadata.gz: 1f0b026c941e50454283953976c11eef81cba06e8c37ddb6ffaffbfb1ca1c3ef030c1b6e82c5be68c9151948465fa335ae4f3b79a8e2606a4a0190559e6f07cd
-  data.tar.gz: 0b321da7a85b6fe8620fe1863ac26560c3dd40a5fa06eabf1a7d4d1ec0f299d296994634370bac9c66a82990440ae2d578ced623b617474d2f864ec8b6443bde
+  metadata.gz: 4181481765b293567c425908b00f9c0518bf69993ccf728016ad997c2f4dbc3434acd9ea852184bc3eadf98d90ba64996c21c20bb7da0755c517e722ce607d40
+  data.tar.gz: ab44200dda93ed92505d3b218bd656b6877ea8e289d56608ffc99cfcd9d7338945c59bc43c552c1e71a2e32664666ec6d02aa7062176fcb38a67624d811d93ac

data/.gitignore

@@ -8,4 +8,4 @@
 /spec/reports/
 /tmp/
 
-spec/rails_app/log
+spec/rails_app/log/*

data/.reek.yml

@@ -0,0 +1,25 @@
+detectors:
+  IrresponsibleModule:
+    enabled: false
+directories:
+  "app/controllers":
+    IrresponsibleModule:
+      enabled: false
+    NestedIterators:
+      max_allowed_nesting: 2
+    UnusedPrivateMethod:
+      enabled: false
+    InstanceVariableAssumption:
+      enabled: false
+  "app/helpers":
+    IrresponsibleModule:
+      enabled: false
+    UtilityFunction:
+      enabled: false
+  "app/mailers":
+    InstanceVariableAssumption:
+      enabled: false
+  "app/models":
+    InstanceVariableAssumption:
+      enabled: false
+

data/.rubocop.yml

@@ -0,0 +1,35 @@
+require: rubocop-rspec
+
+LineLength:
+  Max: 100
+
+Documentation:
+  Enabled: false
+
+FrozenStringLiteralComment:
+  Enabled: false
+
+WordArray:
+  Enabled: false
+
+SymbolArray:
+  Enabled: false
+
+Rails:
+  Enabled: true
+
+RSpec/ExampleLength:
+  Max: 10
+
+Style/MutableConstant:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*_spec.rb'
+
+AllCops:
+  Exclude:
+    - 'db/schema.rb'
+    - 'db/migrate/*.rb'
+    - 'config/**/*.rb'

data/README.md

@@ -21,6 +21,15 @@ Then run:
 rails generate log_book:install
 rake db:migrate
 ```
+## Reasoning
+
+We built this gem because others did not offer us what we needed.
+
+Benefits:
+- new features ([Squashing](#squashing))
+- Explicit (needs to be told when to record, as opposed to paper_trail or audited which always record; ie. do not record stuff done in console)
+- Has an inbuilt caching mechanism with `meta` field
+- ``meta`` field can also be used to add aditional keys on which search queries can be run
 
 ## Usage
 
@@ -44,6 +53,73 @@ Add to controlers and actions you want the tracker to be active:
 
 By default, whenever a user record is created, updated or deleted in any actions of users\_controller a new log\_book record will be created.
 
+## Squashing
+
+The idea of squashing came when we needed to show an activity page where you have a has_many relation setup but you need to show changes only on the "main" object.
+
+Example:
+
+```ruby
+class Hotel < ApplicationRecord
+  include LogBook::Recorder
+  has_log_book_records
+
+  has_many :amenities
+  accepts_nested_attributes_for :amenities
+end
+
+class HotelAmenity < ApplicationRecord
+  include LogBook::Recorder
+  has_log_book_records, parent: :hotel
+
+  belongs_to :hotel
+  belongs_to :amenity
+end
+
+class Amenity < ApplicationRecord
+  has_many :hotels
+end
+
+class HotelsController < ApplicationController
+  def create
+    @hotel = Hotel.create(hotel_params)
+  end
+
+  def hotel_params
+    params.require(:hotel).permit(amenities_attributes: [:id, :status])
+  end
+end
+
+# having this params passed to hotels_controller:
+{ name: 'Hotel', amenitites_attributes: { 0: {id: 1, status: :avaliable}, 1: { id: 4, status: :unavaliable } } }
+
+# Without squashing you would have these records in the DB (abbreviated for clairity)
+[
+  {subject_type: 'Hotel',        subject_id: 1, parent_type: nil,     parent_id: nil, record_changes: { name: [nil, 'Hotel']}},
+  {subject_type: 'HotelAmenity', subject_id: 1, parent_type: 'Hotel', parent_id: 1,   record_changes: { name: [nil, 'avaliable']}},
+  {subject_type: 'HotelAmenity', subject_id: 4, parent_type: 'Hotel', parent_id: 1,   record_changes: { name: [nil, 'unavaliable']}},
+]
+
+# The above is rather difficult to paginate if you want to show changes done on HotelAmenities to show under Hotel.
+# With squashing enabled:
+[
+  {
+    subject_type: 'Hotel',
+    subject_id: 1,
+    parent_type: nil,
+    parent_id: nil,
+    record_changes: {
+      name: [nil, 'Hotel'],
+      hotel_amenitites: {
+        1: {status: [nil, 'avaliable']},
+        2: {status: [nil, 'unavaliable']}
+      }
+    }
+  }
+]
+
+```
+
 ## ActiveRecord Options
 
 ### fields
@@ -82,7 +158,7 @@ By default, whenever a user record is created, updated or deleted in any actions
 
 ### parent
 
-Define who is a parent of this object. Will be recorded in a `parent` polymorphic columns
+Define who is a parent of this object.
 
 ``` ruby
   class User < ActiveRecord::Base
@@ -94,6 +170,31 @@ Define who is a parent of this object. Will be recorded in a `parent` polymorphi
   end
 ```
 
+### parent_of
+
+Define who this object is a parent of.
+
+``` ruby
+  class Account < ActiveRecord::Base
+    include LogBook::Recorder
+    has_many :user_memberships
+    has_many :users, through: :user_memberships
+  end
+
+  def UserMembership < ActiveRecord::Base
+    belongs_to :account
+    belongs_to :user
+  end
+
+  class User < ActiveRecord::Base
+    has_one :user_membership
+    has_one :account, through: :user_membership
+
+    # Parent is Company and will be recorded with each user change
+    # has_log_book_records parent_of: :account
+  end
+```
+
 ### meta
 
 Arbitrary column. This is a jsonb field which can have all kinds of information. Useful when you want to cache fields at the exact point of record creation
@@ -113,18 +214,6 @@ Arbitrary column. This is a jsonb field which can have all kinds of information.
   end
 ```
 
-### squash
-
-Enables/disables suashing on this model
-
-``` ruby
-  class User < ActiveRecord::Base
-    include LogBook::Recorder
-
-    # Enables squashing (defaults to false)
-    # has_log_book_records squash: true
-```
-
 ## ActionController options
 
 ### current\_author
@@ -159,27 +248,15 @@ end
 
 ``` ruby
 LogBook.with_recording {}         #=> Enables recording within block
-LogBook.without_recording {}      #=> Disables recording within block
-LogBook.record_as(author) {}      #=> Records as a different author within block
+LogBook.author=(author     )      #=> Records as a different author within block
+LogBook.action=(value)            #=> Change default action for this request
 LogBook.with_record_squashing {}  #=> Squashes records within block
 LogBook.enable_recording          #=> Enables recording from this point
 LogBook.disable_recording         #=> Disables recording from this point
 LogBook.record_squashing_enabled  #=> Enables record squashing from this point
 LogBook.recording_enabled         #=> Returns true if recording is enabled
-LogBook.recording_enabled=(val)   #=> Enables/Disables recording
-LogBook.squash_records            #=> Squash records with current :request_uuid
 ```
 
-## Squashing
-
-The idea of squashing came when we needed to show an activity page where all changes made in the single request as one change.
-
-Each request has its own unique `request_uuid` and it is recorded with each record. If squashing is enabled, `after_action` method with squashing is called.
-All records with the same `request_uuid` are "squashed" into one record.
-
-``` sql
-INSERT INTO "users" ("name", "email") VALUES ("test", "test@test.com")
-```
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "log_book"
+require "rails"
+require "rails_log_book"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/log_book/configuration.rb

@@ -1,28 +1,10 @@
 module LogBook
-  def self.configure
-    @configuration ||= Configuration.new
-    yield(@configuration)
-  end
+  extend Dry::Configurable
 
-  def self.config
-    @configuration ||= Configuration.new
-  end
-
-  class Configuration
-    attr_accessor :records_table_name
-    attr_accessor :ignored_attributes
-    attr_accessor :recording_enabled
-    attr_accessor :author_method
-    attr_accessor :record_squashing
-    attr_accessor :skip_if_empty_actions
-
-    def initialize
-      @records_table_name = 'records'
-      @ignored_attributes = [:updated_at, :created_at]
-      @author_method = :current_user
-      @record_squashing = false
-      @recording_enabled = false
-      @skip_if_empty_actions = [:update]
-    end
-  end
+  setting :records_table_name,    'records'
+  setting :ignored_attributes,    [:updated_at, :created_at]
+  setting :recording_enabled,     false
+  setting :author_method,         :current_user
+  setting :record_squashing,      false
+  setting :skip_if_empty_actions, [:update]
 end

data/lib/log_book/controller_record.rb

@@ -4,24 +4,24 @@ module LogBook
 
     included do
       before_action :enable_recording
-      around_action :record_squashing
+      after_action :save_records
     end
 
     def enable_recording
-      LogBook.store[:controller] = self
-      LogBook.store[:author] = current_author
-      LogBook.store[:request_uuid] = try(:request).try(:uuid) || SecureRandom.hex
+      action = "#{controller_name}##{action_name}"
+      author = current_author
+      request_uuid = try(:request).try(:uuid) || SecureRandom.hex
+      LogBook::Store.tree = LogBook::Tree.new(action: action, author: author, request_uuid: request_uuid)
       LogBook.enable_recording
     end
 
-    def record_squashing
-      LogBook.with_record_squashing do
-        yield
-      end
+    def save_records
+      LogBook::SaveRecords.call
     end
 
     def current_author
       raise NotImplementedError unless respond_to?(LogBook.config.author_method, true)
+
       send(LogBook.config.author_method)
     end
   end

data/lib/log_book/record.rb

@@ -5,29 +5,5 @@ module LogBook
     belongs_to :subject, polymorphic: true
     belongs_to :author, polymorphic: true
     belongs_to :parent, polymorphic: true
-
-    before_create :set_request_uuid
-
-    def self.collection_cache_key(collection = all, timestamp_column = :created_at)
-      super(collection, timestamp_column)
-    end
-
-    def subject_key
-      subject.class.table_name
-    end
-
-    def changes_to_record?
-      !(record_changes == {} && skip_if_empty_actions.include?(action))
-    end
-
-    private
-
-    def set_request_uuid
-      self.request_uuid ||= LogBook.store[:request_uuid] || SecureRandom.uuid
-    end
-
-    def skip_if_empty_actions
-      (subject.recording_options[:skip_if_empty_actions] || LogBook.config.skip_if_empty_actions).map(&:to_s)
-    end
   end
 end

data/lib/log_book/recorder.rb

@@ -12,9 +12,9 @@ module LogBook
         scope :with_records, -> { joins(:records) }
 
         on = Array.wrap(options[:on])
-        after_create :create_record if on.empty? || on.include?(:create)
-        after_update :update_record if on.empty? || on.include?(:update)
-        after_destroy :destroy_record if on.empty? || on.include?(:destroy)
+        after_create :store_changes if on.empty? || on.include?(:create)
+        after_update :store_changes if on.empty? || on.include?(:update)
+        after_destroy :store_changes if on.empty? || on.include?(:destroy)
 
         extend LogBook::Recorder::RecordingClassMethods
         include LogBook::Recorder::RecordingInstanceMethods
@@ -22,8 +22,12 @@ module LogBook
     end
 
     module RecordingInstanceMethods
-      def to_squash?
-        recording_options[:squash]
+      def recording_changes
+        @recording_changes ||= RecordingChanges.new(self)
+      end
+
+      def recording_options
+        self.class.recording_options
       end
 
       def save_with_recording
@@ -42,6 +46,10 @@ module LogBook
         self.class.non_recording_columns
       end
 
+      def recording_key
+        "#{self.class.table_name}_#{id}"
+      end
+
       private
 
       def record_changes
@@ -53,43 +61,23 @@ module LogBook
         end
       end
 
-      def create_record
-        write_record(:create)
-      end
-
-      def update_record
-        write_record(:update)
-      end
-
-      def destroy_record
-        write_record(:destroy)
-      end
-
-      def write_record(action)
+      def store_changes
         return unless LogBook.recording_enabled
-        record = new_record(LogBook.store[:action] || action)
-        return unless record.changes_to_record?
-        record.save
-      end
 
-      def new_record(action)
-        record = LogBook::Record.new(
-          action: action,
-          record_changes: record_changes,
-          author: LogBook.store[:author],
-          subject: self,
-          meta: {}
-        )
-        record.meta = log_book_meta_info(record) if recording_options[:meta].present?
-        record.parent = send(recording_options[:parent]) if recording_options[:parent].present?
-        record
+        recording_changes.tap do |record|
+          record.record_changes = record_changes
+          record.meta = log_book_meta_info(record) if recording_options[:meta].present?
+        end
+
+        LogBook::Store.tree.add(recording_changes)
       end
 
       def log_book_meta_info(record)
-        case recording_options[:meta]
+        meta_options = recording_options[:meta]
+        case meta_options
         when NilClass then nil
-        when Symbol then send(recording_options[:meta], record)
-        when Proc then recording_options[:meta].call(self, record)
+        when Symbol then send(meta_options, record)
+        when Proc then meta_options.call(self, record)
         when TrueClass then log_book_meta(record)
         end
       end
@@ -121,5 +109,58 @@ module LogBook
         [primary_key, inheritance_column, *Array.wrap(LogBook.config.ignored_attributes)]
       end
     end
+
+    class RecordingChanges
+      attr_reader :subject
+      attr_reader :action
+      attr_reader :author
+      attr_reader :record_changes
+      attr_reader :meta
+      attr_reader :request_uuid
+      attr_accessor :recording_key
+
+      def initialize(recorder)
+        @subject = recorder
+        @recording_key = subject.recording_key
+        @record_changes = {}
+        @meta = {}
+      end
+
+      def record_changes=(value)
+        @record_changes.merge!(value)
+      end
+
+      def meta=(value)
+        @meta.merge!(value)
+      end
+
+      def changes?
+        meta.present? || record_changes.present?
+      end
+
+      def subject_key
+        subject.class.table_name
+      end
+
+      def subject_id
+        subject.id
+      end
+
+      def parent
+        self.class.new(subject.send(subject.recording_options[:parent])) if subject.recording_options[:parent]
+      end
+
+      def children
+        self.class.new(subject.send(subject.recording_options[:parent_of])) if subject.recording_options[:parent_of]
+      end
+
+      def to_h
+        {
+          subject: subject,
+          record_changes: record_changes,
+          meta: meta
+        }
+      end
+    end
   end
 end

data/lib/log_book/save_records.rb

@@ -0,0 +1,56 @@
+module LogBook
+  class SaveRecords
+    def initialize
+      @tree = LogBook::Store.tree
+    end
+
+    def self.call
+      new.call
+    end
+
+    def call
+      return unless LogBook.recording_enabled
+
+      squash_tree(tree) if LogBook.record_squashing_enabled
+
+      tree.records(only_roots: LogBook.record_squashing_enabled).each do |_key, record|
+        create_record(record.value)
+      end
+    end
+
+    private
+
+    attr_reader :tree
+
+    def squash_tree(tree)
+      tree.depth.downto(1).each do |depth|
+        nodes = tree.at_depth(depth)
+        nodes.each do |_, node|
+          next unless node.value.changes?
+          parent = node.parent.value
+
+          parent.record_changes = squashed_changes(node.value, parent.record_changes, :record_changes)
+          parent.meta = squashed_changes(node.value, parent.meta, :meta)
+        end
+      end
+    end
+
+    def squashed_changes(record, object, key)
+      object[record.subject_key] ||= {}
+      object[record.subject_key][record.subject_id] = record.send(key)
+      object
+    end
+
+    def create_record(record)
+      return unless record.changes?
+
+      attributes = record.to_h
+      attributes.merge!(
+        author: tree.author,
+        action: tree.action,
+        request_uuid: tree.request_uuid
+      )
+      LogBook::Record.create(attributes)
+    end
+  end
+end

data/lib/log_book/store.rb

@@ -0,0 +1,12 @@
+module LogBook
+  class Store < ActiveSupport::CurrentAttributes
+    # attribute :author
+    # attribute :action
+    # attribute :controller
+    # attribute :request_uuid
+    attribute :recording_enabled
+    attribute :record_squashing
+
+    attribute :tree
+  end
+end

data/lib/log_book/tree.rb

@@ -0,0 +1,74 @@
+module LogBook
+  class Tree
+    attr_accessor :author, :action, :request_uuid, :nodes, :depth
+
+    def initialize(author: nil, action: nil, request_uuid: nil)
+      @nodes = {}
+      @depth = 0
+      @author = author
+      @action = action
+      @request_uuid = request_uuid
+    end
+
+    def add(record)
+      node = nodes[record.recording_key] ||= Node.new(record)
+      add_parent(node, record.parent)
+      add_children(node, record.children)
+    end
+
+    def add_parent(node, parent)
+      return unless parent
+
+      parent_node = nodes[parent.recording_key] ||= Node.new(parent)
+      node.parent = parent_node
+      parent_node.children << node
+      update_depth(parent_node, parent_node.depth)
+    end
+
+    def add_children(node, children)
+      return unless children
+
+      Array.wrap(children).each do |child|
+        add_child(node, child)
+      end
+    end
+
+    def add_child(node, child)
+      return unless child
+
+      child_node = nodes[child.recording_key] ||= Node.new(child)
+      child_node.parent = node
+      node.children << child_node
+      update_depth(node, node.depth)
+    end
+
+    def update_depth(node, depth)
+      node.depth = depth
+      @depth = [@depth, depth].max
+      node.children.each do |child|
+        update_depth(child, depth + 1)
+      end
+    end
+
+    def records(only_roots: false)
+      only_roots ? at_depth(0) : nodes
+    end
+
+    def at_depth(depth)
+      nodes.select { |_, node| node.depth == depth}
+    end
+
+    class Node
+      attr_reader :value
+      attr_accessor :parent
+      attr_accessor :children
+      attr_accessor :depth
+
+      def initialize(value)
+        @value = value
+        @depth = 0
+        @children = []
+      end
+    end
+  end
+end

data/lib/log_book/version.rb

@@ -1,3 +1,3 @@
 module LogBook
-  VERSION = '1.0.0'
+  VERSION = '2.1.0'
 end

data/lib/rails_log_book.rb

@@ -1,7 +1,11 @@
 require 'active_record'
-require 'request_store'
+require 'active_support/current_attributes'
+require 'dry-configurable'
+
 require 'log_book/configuration'
-require 'log_book/squash_records'
+require 'log_book/store'
+require 'log_book/tree'
+require 'log_book/save_records'
 require 'log_book/record'
 require 'log_book/recorder'
 require 'log_book/controller_record'
@@ -10,64 +14,40 @@ require 'log_book/railtie'
 
 module LogBook
   class << self
-    def store
-      RequestStore.store[:log_book] ||= {}
-    end
-
     def with_recording
       recording_was_disabled = recording_enabled
       enable_recording
-      yield
-    ensure
-      disable_recording unless recording_was_disabled
-    end
+      LogBook::Store.tree = LogBook::Tree.new
 
-    def without_recording
-      recording_was_enabled = recording_enabled
-      disable_recording
       yield
-    ensure
-      enable_recording unless recording_was_enabled
-    end
 
-    def record_as(author)
-      prev_author = LogBook.store[:author]
-      LogBook.store[:author] = author
-      yield
+      LogBook::SaveRecords.call
     ensure
-      LogBook.store[:author] = prev_author
-    end
-
-    def with_record_squashing
-      yield
-      squash_records if record_squashing_enabled
+      disable_recording unless recording_was_disabled
     end
 
     def recording_enabled
-      LogBook.store.fetch(:recording_enabled, false)
+      LogBook::Store.recording_enabled || LogBook.config.recording_enabled
     end
 
     def record_squashing_enabled
-      LogBook.store.fetch(:record_squashing, LogBook.config.record_squashing)
+      LogBook::Store.record_squashing || LogBook.config.record_squashing
     end
 
     def disable_recording
-      LogBook.recording_enabled = false
+      LogBook::Store.recording_enabled = false
     end
 
     def enable_recording
-      LogBook.recording_enabled = true
+      LogBook::Store.recording_enabled = true
     end
 
-    def recording_enabled=(val)
-      LogBook.store[:recording_enabled] = val
+    def action=(val)
+      LogBook::Store.tree.action = val
     end
 
-    def squash_records
-      return if LogBook.store[:request_uuid].nil?
-      records = LogBook::Record.where(request_uuid: LogBook.store[:request_uuid])
-      return unless records.exists?
-      LogBook::SquashRecords.new(records).call
+    def author=(val)
+      LogBook::Store.tree.author = val
     end
   end
 end

data/log_book.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'log_book/version'
 
@@ -25,12 +25,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'factory_bot'
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec-rails'
 
-  spec.add_dependency 'request_store'
   spec.add_dependency 'activerecord', '> 5.2'
+  spec.add_dependency 'activesupport', '> 5.2'
+  spec.add_dependency 'dry-configurable'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_log_book
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Stjepan Hadjic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2019-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,21 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,27 +81,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: request_store
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -122,6 +122,34 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Write a longer description or delete this line.
 email:
 - stjepan.hadjic@infinum.co
@@ -130,7 +158,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".reek.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -148,7 +178,9 @@ files:
 - lib/log_book/railtie.rb
 - lib/log_book/record.rb
 - lib/log_book/recorder.rb
-- lib/log_book/squash_records.rb
+- lib/log_book/save_records.rb
+- lib/log_book/store.rb
+- lib/log_book/tree.rb
 - lib/log_book/version.rb
 - lib/rails_log_book.rb
 - lib/tasks/log_book.rake
@@ -174,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Write a short summary, because Rubygems requires one.

data/lib/log_book/squash_records.rb

@@ -1,50 +0,0 @@
-module LogBook
-  class SquashRecords
-    def initialize(records)
-      @records = records
-    end
-
-    def call
-      records.group_by(&:parent).each do |parent, children|
-        children_to_squash = children.select { |child| child.subject.try(:to_squash?) }
-        next if children_to_squash.empty?
-
-        if parent.present?
-          parent_in_records = parent_in_records(parent)
-          parent_in_records.record_changes.merge!(squashed_changes(children_to_squash, :record_changes))
-          parent_in_records.meta.merge!(squashed_changes(children_to_squash, :meta))
-          parent_in_records.created_at ||= children_to_squash.first.created_at
-          parent_in_records.save
-
-          children_to_squash.each(&:delete)
-        else
-          next if children_to_squash.one?
-
-          records.reduce do |main_record, record|
-            main_record.record_changes.merge!(record.record_changes)
-            main_record.meta.merge!(record.meta)
-
-            record.delete
-            main_record
-          end.save
-        end
-      end
-    end
-
-    private
-
-    attr_reader :records
-
-    def squashed_changes(children, key)
-      children.each_with_object({}) do |record, object|
-        object[record.subject_key] ||= {}
-        object[record.subject_key][record.subject_id] = record.send(key)
-      end
-    end
-
-    def parent_in_records(parent)
-      records.find { |record| record.subject == parent } ||
-        parent.new_record
-    end
-  end
-end