active_snapshot 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae65e9cfd6d45c8c60d4766bf54e54c9c79692dde454a99c0b6eb4acc67878f7
-  data.tar.gz: aae883536807c9f8469c6b19792e509299538c942f985d8e1dbdf7afbf45e012
+  metadata.gz: 5b48af4ad66af3d9fe9110f544df49f29ec6586969cb7e2c7f62431b54163a84
+  data.tar.gz: fddc58303f066d5b77b56304c4367874e2b3dda0ea2e76e710d81a0f1705861e
 SHA512:
-  metadata.gz: 62e07d7c2d1168428b7e043a988a86eb4ab1602654a751cad9d6892b53d2d76ffa68f873c9184441d5c0fa9188395876047af17cce1aea76322f8fe8e1b65135
-  data.tar.gz: 0ed2fd20a0c5f183e398108923a168ad57bc467142962875e3257336dfbb432f3e8097136f39c6d54cc01b4ae42967d91f075f50b3b8cba8af57c30f77d89d60
+  metadata.gz: 9a769fccb45b11f7163384b6ee79e5ff056b897cb3f382bb48054eaf9e20dba87371ab6b42da4ac117eafd136ebdc5d2dcd3441c7cf3a397ea087ec481dbc61d
+  data.tar.gz: 2ca41b8874d1511596e25893ddb9b0b05daeead16a12150ff25b1812b1dd3f2901fdcad501ece2681b4a96161e8909e5fd475d52e8c7eda72d74e83804b38574

data/CHANGELOG.md

@@ -2,9 +2,17 @@ CHANGELOG
 ---------
 
 - **Unreleased**
-  * [View Diff](https://github.com/westonganger/active_snapshot/compare/v0.3.1...master)
+  * [View Diff](https://github.com/westonganger/active_snapshot/compare/v0.4.0...master)
   * Nothing yet
 
+- **v0.4.0** - July 23, 2024
+  * [View Diff](https://github.com/westonganger/active_snapshot/compare/v0.3.2...v0.4.0)
+  * [#44](https://github.com/westonganger/active_snapshot/pull/44) - Remove dependency on activerecord-import with vanilla ActiveRecord upsert_all
+
+- **v0.3.2** - Oct 17, 2023
+  * [View Diff](https://github.com/westonganger/active_snapshot/compare/v0.3.1...v0.3.2)
+  * [#43](https://github.com/westonganger/active_snapshot/pull/43) - Fix unique index error in generated DB migration
+
 - **v0.3.1** - August 4, 2023
   * [View Diff](https://github.com/westonganger/active_snapshot/compare/v0.3.0...v0.3.1)
   * [#36](https://github.com/westonganger/active_snapshot/pull/36) - Allow ActiveRecord to be lazy loaded using `ActiveSupport.on_load`

data/README.md

@@ -1,7 +1,7 @@
 # ActiveSnapshot
 
 <a href="https://badge.fury.io/rb/active_snapshot" target="_blank"><img height="21" style='border:0px;height:21px;' border='0' src="https://badge.fury.io/rb/active_snapshot.svg" alt="Gem Version"></a>
-<a href='https://github.com/westonganger/active_snapshot/actions' target='_blank'><img src="https://github.com/westonganger/active_snapshot/workflows/Tests/badge.svg" style="max-width:100%;" height='21' style='border:0px;height:21px;' border='0' alt="CI Status"></a>
+<a href='https://github.com/westonganger/active_snapshot/actions' target='_blank'><img src="https://github.com/westonganger/active_snapshot/actions/workflows/test.yml/badge.svg?branch=master" style="max-width:100%;" height='21' style='border:0px;height:21px;' border='0' alt="CI Status"></a>
 <a href='https://rubygems.org/gems/active_snapshot' target='_blank'><img height='21' style='border:0px;height:21px;' src='https://img.shields.io/gem/dt/active_snapshot?color=brightgreen&label=Rubygems%20Downloads' border='0' alt='RubyGems Downloads' /></a>
 
 Simplified snapshots and restoration for ActiveRecord models and associations with a transparent white-box implementation.
@@ -101,24 +101,24 @@ snapshot.destroy!
 ```ruby
 class Post < ActiveRecord::Base
   include ActiveSnapshot
-  
+
   has_snapshot_children do
     ### Executed in the context of the instance / self
 
     ### Reload record from database to ensure a clean state and eager load the specified associations
     instance = self.class.includes(:tags, :ip_address, comments: [:comment_sub_records]).find(id)
-    
+
     ### Define the associated records that will be restored
     {
       comments: instance.comments,
-      
+
       ### Nested Associations can be handled by simply mapping them into an array
-      comment_sub_records: instance.comments.flat_map{|x| x.comment_sub_records }, 
-      
+      comment_sub_records: instance.comments.flat_map{|x| x.comment_sub_records },
+
       tags: {
         records: instance.tags
       },
-      
+
       ip_address: {
         record: instance.ip_address,
         delete_method: ->(item){ item.release! }
@@ -133,7 +133,7 @@ Now when you run `create_snapshot!` the associations will be tracked accordingly
 
 # Reifying Snapshot Items
 
-You can view all of the reified snapshot items by calling the following method. Its completely up to you on how to use this data. 
+You can view all of the reified snapshot items by calling the following method. Its completely up to you on how to use this data.
 
 ```ruby
 reified_parent, reified_children_hash = snapshot.fetch_reified_items

data/lib/active_snapshot/models/concerns/snapshots_concern.rb

@@ -22,21 +22,23 @@ module ActiveSnapshot
         metadata: (metadata || {}),
       })
 
-      snapshot_items = []
+      new_entries = []
 
-      snapshot_items << snapshot.build_snapshot_item(self)
+      current_time = Time.now
+
+      new_entries << snapshot.build_snapshot_item(self).attributes.merge(created_at: current_time)
 
       snapshot_children = self.children_to_snapshot
 
       if snapshot_children
         snapshot_children.each do |child_group_name, h|
           h[:records].each do |child_item|
-            snapshot_items << snapshot.build_snapshot_item(child_item, child_group_name: child_group_name)
+            new_entries << snapshot.build_snapshot_item(child_item, child_group_name: child_group_name).attributes.merge(created_at: current_time)
           end
         end
       end
 
-      SnapshotItem.import(snapshot_items, validate: true)
+      SnapshotItem.upsert_all(new_entries.map{|x| x.delete("id"); x }, returning: false)
 
       snapshot
     end

data/lib/active_snapshot/version.rb

@@ -1,3 +1,3 @@
 module ActiveSnapshot
-  VERSION = "0.3.1".freeze
+  VERSION = "0.4.0".freeze
 end

data/lib/active_snapshot.rb

@@ -4,8 +4,6 @@ require "active_snapshot/config"
 require 'active_support/lazy_load_hooks'
 
 ActiveSupport.on_load(:active_record) do
-  require "activerecord-import"
-
   require "active_snapshot/models/snapshot"
   require "active_snapshot/models/snapshot_item"
 

data/lib/generators/active_snapshot/install/templates/create_snapshots_tables.rb.erb

@@ -3,16 +3,23 @@ class <%= migration_name %> < ActiveRecord::Migration::Current
   def change
     create_table :snapshots<%= table_options %> do |t|
       t.belongs_to :item, polymorphic: true, null: false, index: true
-      t.string :identifier, unique: [:item_id, :item_type], index: true
       t.belongs_to :user, polymorphic: true
+
+      t.string :identifier, index: true
+      t.index [:identifier, :item_id, :item_type], unique: true
+
       t.<%= ActiveSnapshot.config.storage_method == 'native_json' ? 'json' : 'text' %> :metadata
+
       t.datetime :created_at, null: false
     end
 
     create_table :snapshot_items<%= table_options %> do |t|
       t.belongs_to :snapshot, null: false, index: true
-      t.belongs_to :item, polymorphic: true, null: false, unique: [:snapshot_id], index: true
+      t.belongs_to :item, polymorphic: true, null: false, index: true
+      t.index [:snapshot_id, :item_id, :item_type], unique: true
+
       t.<%= ActiveSnapshot.config.storage_method == 'native_json' ? 'json' : 'text' %> :object, null: false
+
       t.datetime :created_at, null: false
       t.string :child_group_name
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_snapshot
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Weston Ganger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-04 00:00:00.000000000 Z
+date: 2024-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord-import
-  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +156,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Dead simple snapshot versioning for ActiveRecord models and associations.