embedded_associations 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6d41192bb48a2704dbc2356512872935acac014
-  data.tar.gz: eee1b040f3c264e88ab493fca6f18a8c63231857
+  metadata.gz: a3effa8457a2ccc4e44fdefbc2ad1ef44fd4089e
+  data.tar.gz: f9d66cb68fa8531fef3ec954266b6d85a56a09f2
 SHA512:
-  metadata.gz: 3cc1b91d346d294d8368ba4a2e78724c47294072613896f0e5e4f60c571bcaf6520641bbd188c6d3ae80930ee9909d6e5e9136727d7bdccfbcb1fac37092eba1
-  data.tar.gz: 595ab5ab518d466eb4227d28c0d47781e588ee2b377fdd89c61d558dfa7c8f5d41095745902407d92c4cabbebe75e093aea4fb1565ff1d429d4cef6e8e038a85
+  metadata.gz: 9ea8022101eec7659c39b09fdef7a8cc27192347f97a0c5e91176a1cdc2904846dca0f7c8383d8efb60bbfdf4809adb40358abe6129bd3c1bede626c3c66c649
+  data.tar.gz: 28f019c864eedb7f1580c3d817290cccc04cac5b2a2c7d37383c6f26ed4c8ee73f0fcbdd5aaf959a4201b64bb0495de80f1b26e0c073bf25512e8613ff31009e

data/Gemfile

@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'rails', '4.0.2'
+  gem 'rails', '~> 4.2'
   gem 'sqlite3'
-  gem 'active_model_serializers'
+  gem 'active_model_serializers', git: 'https://github.com/getoutreach/active_model_serializers.git'
 
   gem 'rspec'
   gem 'rspec-rails'

data/lib/embedded_associations.rb

@@ -118,10 +118,13 @@ module EmbeddedAssociations
         if id = attrs['id']
           # can't use current_assoc.find(id), see http://stackoverflow.com/questions/11605120/autosave-ignored-on-has-many-relation-what-am-i-missing
           r = current_assoc.find{|r| r.id == id.to_i}
-          attrs = controller.send(:filter_attributes, r.class.name, attrs, :update)
-          handle_resource(child_definition, r, attrs) if child_definition
-          r.assign_attributes(attrs)
-          run_before_update_callbacks(r)
+
+          if r
+            attrs = controller.send(:filter_attributes, r.class.name, attrs, :update)
+            handle_resource(child_definition, r, attrs) if child_definition
+            r.assign_attributes(attrs)
+            run_before_update_callbacks(r)
+          end
         else
           inheritance_column = parent.class.reflect_on_association(name).klass.inheritance_column
           # need to pass in inheritance column in build to get correct class

data/lib/embedded_associations/version.rb

@@ -1,3 +1,3 @@
 module EmbeddedAssociations
-  VERSION = "4.1.1"
+  VERSION = "4.1.2"
 end

data/spec/embedded_associations_spec.rb

@@ -31,6 +31,7 @@ describe PostsController, type: :controller do
         hash[:tags] += [{},{}]
         json = post :update, :id => resource.id, post: hash
 
+        expect(json.response_code).to eq(200)
         expect(Post.count).to eq(1)
         expect(Tag.count).to eq(4)
 
@@ -41,6 +42,7 @@ describe PostsController, type: :controller do
         hash[:tags] = hash[:tags].take(1)
         json = post :update, :id => resource.id, post: hash
 
+        expect(json.response_code).to eq(200)
         expect(Post.count).to eq(1)
         expect(Tag.count).to eq(1)
 
@@ -51,6 +53,7 @@ describe PostsController, type: :controller do
         hash.delete(:tags)
         json = post :update, :id => resource.id, post: hash
 
+        expect(json.response_code).to eq(200)
         expect(Post.count).to eq(1)
         expect(Tag.count).to eq(2)
 
@@ -61,6 +64,7 @@ describe PostsController, type: :controller do
         hash[:tags].first[:name] = 'modified'
         json = post :update, :id => resource.id, post: hash
 
+        expect(json.response_code).to eq(200)
         expect(Post.count).to eq(1)
         expect(Tag.count).to eq(2)
 
@@ -69,8 +73,33 @@ describe PostsController, type: :controller do
         Tag.all.each{ |t| expect(t.post).to_not be_nil }
       end
 
-    end
+      it "should ignore missing child records" do
+        hash[:tags].first[:name] = "modified"
+        hash[:tags] += [{ id: 0, name: "foo" }]
+        json = post :update, :id => resource.id, post: hash
+
+        expect(json.response_code).to eq(200)
+        expect(Post.count).to eq(1)
+        expect(Tag.count).to eq(2)
+
+        expect(Tag.first.name).to eq("modified")
+      end
 
+      context "with a named tag and a uniqueness constraint" do
+        let(:tags) {[ Tag.create(name: "foo") ]}
+
+        it "should require an ID to supply existing records" do
+          json = post :update, id: resource.id, post: hash.merge(tags: [{ name: "foo" }])
+          expect(json.response_code).to eq(422)
+
+          json = post :update, id: resource.id, post: hash.merge(tags: [{ id: tags[0].id, name: "foo" }])
+          expect(json.response_code).to eq(200)
+          expect(Post.count).to eq(1)
+          expect(Tag.count).to eq(1)
+          expect(Tag.first.name).to eq("foo")
+        end
+      end
+    end
   end
 
   describe "embedded belongs_to" do

data/spec/support/app/app/controllers/posts_controller.rb

@@ -11,15 +11,21 @@ class PostsController < ApplicationController
   def create
     params = post_params
     handle_embedded_associations(resource, params)
-    resource.update_attributes(params)
-    render json: resource
+    if resource.update_attributes(params)
+      render json: resource
+    else
+      render json: {}, status: 422
+    end
   end
 
   def update
     params = post_params
     handle_embedded_associations(resource, params)
-    resource.update_attributes(params)
-    render json: resource
+    if resource.update_attributes(params)
+      render json: resource
+    else
+      render json: {}, status: 422
+    end
   end
 
   def destroy
@@ -46,7 +52,7 @@ class PostsController < ApplicationController
       :title,
       comments: [:content, user: [:name, :email, account: [:note] ]],
       user: [:type, :name, :email, account: [:note] ],
-      tags: [:name],
+      tags: [:id, :name],
       category: [:name]
     )
   end

data/spec/support/app/app/models/tag.rb

@@ -1,3 +1,5 @@
 class Tag < ActiveRecord::Base
   belongs_to :post
+
+  validates :name, uniqueness: true, allow_blank: true
 end

data/spec/support/app/config/environments/development.rb

@@ -22,9 +22,6 @@ App::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   config.active_record.auto_explain_threshold_in_seconds = 0.5

data/spec/support/app/config/environments/test.rb

@@ -29,9 +29,6 @@ App::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end

data/spec/support/serialization_helpers.rb

@@ -6,7 +6,7 @@ module SerializationHelpers
   def serialize(model, root=false)
     options = {}
     options[:root] = false unless root
-    params = model.active_model_serializer.new(model, options).as_json
+    params = ActiveModel::Serializer.serializer_for(model).new(model, options).as_json
     params[:id] = model.id if root
     params
   end
@@ -15,4 +15,4 @@ module SerializationHelpers
     arr.map(&method(:serialize))
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embedded_associations
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Gordon L. Hempton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord controller-level support for embedded associations