uuid_associations-active_record 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04434300525cb3350da2af614944510ac429d8daa8b8af49307d77d9f2256162
-  data.tar.gz: dafecc48f8fc8f310d64918b969dd9604f626756a84f5d30b63ac85ec1d46e4e
+  metadata.gz: 3c431b4006e482177f8e0807950bbfedf98a6178e0fab77b490e66a30e4208af
+  data.tar.gz: 6f2c8827ae6e159778e1cef9fc2ac0b0e1caf2d744ee5fdcd49fe79ab501ce5f
 SHA512:
-  metadata.gz: 7def67cca35d303168a43a9fe6d150b9a4015b200fc06f0ad64ecce01e4cafcb6c8b073f35b5e2bf47a8d061586486496d90e856d2401b5c2dd2e832eb816482
-  data.tar.gz: b667b979c70bc6dd31f462f7bb199b6db0b7958f62b5dc07b60c1ed833a9ae5503976453ba48282843dab64fc54877a0581007b2e50c622a1b74afb91c54a75f
+  metadata.gz: c5ddf180335b9ee1363a2a0f512c0b1dca180788888326dad92ff751f27ae1e5e9ffc55ce174d19742b59285c13d394195b4c1deed935fc966b9440dd33a1923
+  data.tar.gz: 80558b8f132ea4e07da6ad2e4bb1b07e3a4de675638d731b7ee520992fde697af3a4ed5de4f867944f53bca66a0f4fb9e1b00790a4e341f582b0964d3da22945

data/README.md

@@ -219,12 +219,13 @@ Here are some things to take into account:
 just preserve the original behavior.
 1. If the hash has both the `:id` and `:uuid` keys, the record will be fetched by `id`, and `uuid` will be passed as an attribute.
 1. When the hash has a `:uuid` key and no record is found for that key, an `ActiveRecord::RecordNotFound` error will be raised.
+   If you want the behavior to be that a new record is created when not found by UUID, you can set the option `create_missing_uuids: true`
+   on the `accepts_nested_attributes_for` call.
 
 ## Future Work
 
 1. Not commonly used by me, but testing and adding these methods to a `has_one` relationship.
 1. Raise not found error if the array of UUIDs is bigger that the array of IDs fetched with the `where` statement (ActiveRecord's behavior).
-1. Allow `accepts_nested_attributes_for` to take a configuration to allow the creation of new records if not found by UUID.
 
 ## Development
 

data/lib/uuid_associations/active_record/inline.rb

@@ -5,3 +5,4 @@ require 'uuid_associations/active_record/nested_attributes_method_definitions'
 
 ::ActiveRecord::Base.extend(UuidAssociations::ActiveRecord::AssociationMethodDefinitions)
 ::ActiveRecord::Base.prepend(UuidAssociations::ActiveRecord::NestedAttributesMethodDefinitions)
+::ActiveRecord::Base.extend(UuidAssociations::ActiveRecord::NestedAttributesMethodDefinitions::ClassMethods)

data/lib/uuid_associations/active_record/nested_attributes/uuid_finder.rb

@@ -2,13 +2,14 @@ module UuidAssociations
   module ActiveRecord
     module NestedAttributes
       class UuidFinder
-        def self.replaced_uuids_with_ids(association_klass, attribute_collection)
-          new(association_klass, attribute_collection).call
+        def self.replaced_uuids_with_ids(association_klass, attribute_collection, options)
+          new(association_klass, attribute_collection, options).call
         end
 
-        def initialize(association_klass, attribute_collection)
+        def initialize(association_klass, attribute_collection, options)
           @association_klass    = association_klass
           @attribute_collection = attribute_collection
+          @options              = options
         end
 
         def call
@@ -26,11 +27,17 @@ module UuidAssociations
 
             record = found_records.find { |found_record| found_record.uuid == uuid }
 
-            if record.blank?
-              raise_not_found_error(uuid)
-            end
+            if @options[:create_missing_uuids]
+              collection << if record.blank?
+                attributes.merge(uuid: uuid)
+              else
+                attributes.merge(id: record.id)
+              end
+            else
+              raise_not_found_error(uuid) if record.blank?
 
-            collection << attributes.merge(id: record.id)
+              collection << attributes.merge(id: record.id)
+            end
           end
 
           to_keep + replaced

data/lib/uuid_associations/active_record/nested_attributes_method_definitions.rb

@@ -3,6 +3,25 @@ require 'uuid_associations/active_record/nested_attributes/uuid_finder'
 module UuidAssociations
   module ActiveRecord
     module NestedAttributesMethodDefinitions
+      module ClassMethods
+        def accepts_nested_attributes_for(*attr_names)
+          options = attr_names.extract_options!
+          create_missing_uuids = { create_missing_uuids: options.delete(:create_missing_uuids) { false } }
+
+          original_payload = super(
+            *(attr_names + [options])
+          )
+
+          attr_names.each do |association_name|
+            nested_attributes_options = self.nested_attributes_options.dup
+            nested_attributes_options[association_name.to_sym] = nested_attributes_options[association_name.to_sym].merge(create_missing_uuids)
+            self.nested_attributes_options = nested_attributes_options
+          end
+
+          original_payload
+        end
+      end
+
       private
 
       def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
@@ -13,7 +32,8 @@ module UuidAssociations
 
         replaced_attributes = ActiveRecord::NestedAttributes::UuidFinder.replaced_uuids_with_ids(
           association_klass,
-          attributes_collection
+          attributes_collection,
+          nested_attributes_options[association_name]
         )
         super(association_name, replaced_attributes)
       end

data/lib/uuid_associations/active_record/version.rb

@@ -1,5 +1,5 @@
 module UuidAssociations
   module ActiveRecord
-    VERSION = '0.3.4'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/spec/integration/nested_attributes/collection_spec.rb

@@ -39,6 +39,25 @@ RSpec.describe 'nested attributes for collection' do
 
       expect(Post.first.comments.count).to eq(1)
     end
+
+    context 'when create_missing_uuids is set to true' do
+      let(:provided_uuid) { SecureRandom.uuid }
+
+      it 'creates a resource even if a uuid is provided' do
+        expect do
+          Post.create!(
+            uuid: SecureRandom.uuid,
+            content: 'post',
+            attachments_attributes: [
+              body: 'New comment', uuid: provided_uuid
+            ]
+          )
+        end.to change(Post, :count).from(0).to(1)
+           .and change(Attachment, :count).from(0).to(1)
+
+        expect(Post.first.attachments.first.uuid).to eq(provided_uuid)
+      end
+    end
   end
 
   context 'when updating existing records' do

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'support/models/post'
 require 'support/models/comment'
 require 'support/models/pet'
 require 'support/models/toy'
+require 'support/models/attachment'
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure

data/spec/support/models/attachment.rb

@@ -0,0 +1,3 @@
+class Attachment < ActiveRecord::Base
+  belongs_to :post, required: false
+end

data/spec/support/models/post.rb

@@ -2,6 +2,8 @@ class Post < ActiveRecord::Base
   belongs_to :user, required: false
 
   has_many :comments
+  has_many :attachments
 
   accepts_nested_attributes_for :comments, allow_destroy: true
+  accepts_nested_attributes_for :attachments, allow_destroy: true, create_missing_uuids: true
 end

data/spec/support/schema.rb

@@ -56,4 +56,12 @@ ActiveRecord::Schema.define version: 0 do
 
     t.timestamps
   end
+
+  create_table :attachments do |t|
+    t.belongs_to :post, foreign_key: { on_delete: :cascade }
+    t.string     :uuid
+    t.string     :body
+
+    t.timestamps
+  end
 end

data/spec/unit/uuid_associations/active_record/nested_attributes/uuid_finder_spec.rb

@@ -2,11 +2,13 @@ require 'uuid_associations/active_record/nested_attributes/uuid_finder'
 
 RSpec.describe UuidAssociations::ActiveRecord::NestedAttributes::UuidFinder do
   describe '.replaced_uuids_with_ids' do
-    subject { described_class.replaced_uuids_with_ids(klass, attribute_collection) }
+    subject { described_class.replaced_uuids_with_ids(klass, attribute_collection, options) }
 
-    let(:post)    { Post.create!(content: 'content', uuid: SecureRandom.uuid) }
-    let(:comment) { Comment.create!(post: post, body: 'my comment', uuid: SecureRandom.uuid) }
-    let(:klass)   { Comment }
+    let(:post)          { Post.create!(content: 'content', uuid: SecureRandom.uuid) }
+    let(:comment)       { Comment.create!(post: post, body: 'my comment', uuid: SecureRandom.uuid) }
+    let(:klass)         { Comment }
+    let(:options)       { {} }
+    let(:provided_uuid) { SecureRandom.uuid }
 
     context 'when attributes come as an array' do
       context 'when UUID is present, but ID is not' do
@@ -15,11 +17,17 @@ RSpec.describe UuidAssociations::ActiveRecord::NestedAttributes::UuidFinder do
         it { is_expected.to contain_exactly(id: comment.id, body: 'updated comment') }
 
         context 'when record with specified UUID does not exist on the sytem' do
-          let(:attribute_collection) { [{ uuid: SecureRandom.uuid, body: 'new comment :/' }] }
+          let(:attribute_collection) { [{ uuid: provided_uuid, body: 'new comment :/' }] }
 
           it 'raises a not found error' do
             expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
           end
+
+          context 'when create_missing_uuids is set' do
+            let(:options) { { create_missing_uuids: true } }
+
+            it { is_expected.to contain_exactly(uuid: provided_uuid, body: 'new comment :/') }
+          end
         end
       end
 
@@ -47,11 +55,17 @@ RSpec.describe UuidAssociations::ActiveRecord::NestedAttributes::UuidFinder do
         it { is_expected.to contain_exactly(id: comment.id, body: 'updated comment') }
 
         context 'when record with specified UUID does not exist on the sytem' do
-          let(:attribute_collection) { { first: { uuid: SecureRandom.uuid, body: 'new comment :/' } } }
+          let(:attribute_collection) { { first: { uuid: provided_uuid, body: 'new comment :/' } } }
 
           it 'raises a not found error' do
             expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
           end
+
+          context 'when create_missing_uuids is set' do
+            let(:options) { { create_missing_uuids: true } }
+
+            it { is_expected.to contain_exactly(uuid: provided_uuid, body: 'new comment :/') }
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uuid_associations-active_record
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Mario Celi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-06 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -153,6 +153,7 @@ files:
 - spec/integration/relationship_definitions/has_and_belongs_to_many_spec.rb
 - spec/integration/relationship_definitions/has_many_spec.rb
 - spec/spec_helper.rb
+- spec/support/models/attachment.rb
 - spec/support/models/comment.rb
 - spec/support/models/pet.rb
 - spec/support/models/post.rb
@@ -193,6 +194,7 @@ test_files:
 - spec/integration/relationship_definitions/has_and_belongs_to_many_spec.rb
 - spec/integration/relationship_definitions/has_many_spec.rb
 - spec/spec_helper.rb
+- spec/support/models/attachment.rb
 - spec/support/models/comment.rb
 - spec/support/models/pet.rb
 - spec/support/models/post.rb