active_snapshot 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 887284049e06d4698fccfb7434fe8e09245ea8a028c03592a0d04905e5ebe74f
-  data.tar.gz: d62943f9f6e392d3c51c9d19112040df9d2027722074169b87c911e923a0623d
+  metadata.gz: 204744938dec9e53545cc73a6497d47b9463b76b0622491d442b5ed4169b7c83
+  data.tar.gz: dee647e71ff99f91e79764f6094e9253fa74b9641e6f2e611ea10485e3d1d570
 SHA512:
-  metadata.gz: be3291eda618c5989e812da726a27d660a54caf1647d30cb136b1029600a9e049dbeeb5331d7d3035c61c7dc9e99de1e9db63ee151c12a81e9352b241257852d
-  data.tar.gz: 11e657296fbde5aa2f3ae7b82d35ed48658eeff915bd24e23602ad06aa7eef000fa6feaf601b1f03633dd594a126835a810dc824e777dfd6a954f1fce441f9eb
+  metadata.gz: fe9542a0beecba0f52d3d25f0dfbd1197f31eb4ab9758f7ccfaf0e5455dfd150ef6ee1ba81fc138383ff8004a9e26a037a6ad72c004766bac1f0a3bf68edb4e6
+  data.tar.gz: eeab5ae90f2dc09f34ece44aa51992df834cf552693849d4595554e08448d4d8fceac954cb5ccbbe47089b1a868eeb089b5391ed3cf8a410aad6d436e6a3ef6a

data/CHANGELOG.md

@@ -2,9 +2,23 @@ CHANGELOG
 ---------
 
 - **UNRELEASED**
-  * [View Diff](https://github.com/westonganger/active_snapshot/compare/v0.2.1...master)
+  * [View Diff](https://github.com/westonganger/active_snapshot/compare/v0.2.4...master)
   * Nothing yet
 
+- **v0.2.4** - Feb 25, 2022
+  * [View Diff](https://github.com/westonganger/active_snapshot/compare/v0.2.3...v0.2.4)
+  * [PR #20](https://github.com/westonganger/active_snapshot/pull/20) - Resolve error when `has_snapshot_children` has not been defined as it should be optional
+  * [PR #18](https://github.com/westonganger/active_snapshot/pull/18) - Fix bug where sub-classes of a model would not be assigned correctly as parent when restoring
+
+- **v0.2.3** - Jan 7, 2022
+  * [View Diff](https://github.com/westonganger/active_snapshot/compare/v0.2.2...v0.2.3)
+  * Support Ruby 3.1 using `YAML.unsafe_load`
+  * Fix unique constraint on snapshots.identifier column
+
+- **v0.2.2** - August 27, 2021
+  * [View Diff](https://github.com/westonganger/active_snapshot/compare/v0.2.1...v0.2.2)
+  * [0715279](https://github.com/westonganger/active_snapshot/commit/0715279) - Fix bug on restore for in `has_snapshot_children` method with nil association values
+
 - **v0.2.1** - August 19, 2021
   * [View Diff](https://github.com/westonganger/active_snapshot/compare/v0.2.0...v0.2.1)
   * [76b6bd9](https://github.com/westonganger/active_snapshot/commit/76b6bd951f73b277891976c458a0cdef0bd77af5) - Improve `has_snapshot_children` method to support single records and nil values which can occur with has_one/belongs_to relationships

data/README.md

@@ -77,7 +77,7 @@ snapshot.restore!
 snapshot.destroy!
 ```
 
-# Restoring Associated / Child Records
+# Tracking Associated / Child Records
 
 ```ruby
 class Post < ActiveRecord::Base
@@ -93,7 +93,7 @@ class Post < ActiveRecord::Base
     {
       comments: instance.comments,
       
-      ### to handle any nested associations simply map them into an array
+      ### Nested Associations can be handled by simply mapping them into an array
       comment_sub_records: instance.comments.flat_map{|x| x.comment_sub_records }, 
       
       tags: {

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

@@ -38,9 +38,7 @@ module ActiveSnapshot
     class_methods do
 
       def has_snapshot_children(&block)
-        if !block_given? && !defined?(@snapshot_children_proc)
-          raise ArgumentError.new("Invalid `has_snapshot_children` requires block to be defined")
-        elsif block_given?
+        if block_given?
           @snapshot_children_proc = block
         else
           @snapshot_children_proc
@@ -69,7 +67,8 @@ module ActiveSnapshot
           snapshot_children[assoc_name] = {}
 
           if opts.nil?
-            next # skip, nil is allowed value in case has_one/belongs_to is nil, etc.
+            ### nil is allowed value in case has_one/belongs_to is nil, etc.
+            snapshot_children[assoc_name][:records] = []
 
           elsif opts.is_a?(ActiveRecord::Base)
             ### Support belongs_to / has_one

data/lib/active_snapshot/models/snapshot.rb

@@ -16,7 +16,13 @@ module ActiveSnapshot
     validates :user_type, presence: true, if: :user_id
 
     def metadata
-      @metadata ||= YAML.load(self[:metadata]).with_indifferent_access
+      yaml_method = "unsafe_load"
+
+      if !YAML.respond_to?("unsafe_load")
+        yaml_method = "load"
+      end
+
+      @metadata ||= YAML.send(yaml_method, self[:metadata]).with_indifferent_access
     end
 
     def metadata=(h)
@@ -92,7 +98,7 @@ module ActiveSnapshot
 
           reified_children_hash[key] << reified_item
 
-        elsif [self.item_id, self.item_type] == [si.item_id, si.item_type]
+        elsif self.item_id == si.item_id && (self.item_type == si.item_type || si.item_type.constantize.new.is_a?(self.item_type.constantize))
           reified_parent = reified_item
         end
       end

data/lib/active_snapshot/models/snapshot_item.rb

@@ -14,7 +14,13 @@ module ActiveSnapshot
     validates :item_type, presence: true, uniqueness: { scope: [:snapshot_id, :item_id] }
 
     def object
-      @object ||= YAML.load(self[:object]).with_indifferent_access
+      yaml_method = "unsafe_load"
+
+      if !YAML.respond_to?("unsafe_load")
+        yaml_method = "load"
+      end
+
+      @metadata ||= YAML.send(yaml_method, self[:object]).with_indifferent_access
     end
 
     def object=(h)

data/lib/active_snapshot/version.rb

@@ -1,3 +1,3 @@
 module ActiveSnapshot
-  VERSION = "0.2.1".freeze
+  VERSION = "0.2.4".freeze
 end

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

@@ -3,7 +3,7 @@ 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, null: false, unique: true, index: true
+      t.string :identifier, null: false, unique: [:item_id, :item_type], index: true
       t.belongs_to :user, polymorphic: true
       t.text :metadata
       t.datetime :created_at, null: false

data/test/dummy_app/app/models/parent_without_children.rb

@@ -0,0 +1,5 @@
+class ParentWithoutChildren < ApplicationRecord
+  include ActiveSnapshot
+
+  self.table_name = "posts"
+end

data/test/dummy_app/app/models/post.rb

@@ -10,6 +10,7 @@ class Post < ActiveRecord::Base
     {
       comments: instance.comments,
       notes: instance.notes,
+      nil_assoc: nil,
     }
   end
 end

data/test/dummy_app/app/models/sub_post.rb

@@ -0,0 +1,11 @@
+class SubPost < Post
+  has_snapshot_children do
+    instance = self.class.includes(:comments, :notes).find(id)
+
+    {
+      comments: instance.comments,
+      notes: instance.notes,
+      nil_assoc: nil,
+    }
+  end
+end

data/test/dummy_app/config/application.rb

@@ -34,14 +34,6 @@ module Dummy
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    config.assets.quiet = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
-
     config.generators.test_framework = false
     config.generators.helper = false
     config.generators.stylesheets = false