embedded_associations 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76c8b0e4ae9164c343480eb95de82cd07a83c8fe
-  data.tar.gz: 04934eb299a9eb501f8f77a8c803bc7715d4925c
+  metadata.gz: f6d41192bb48a2704dbc2356512872935acac014
+  data.tar.gz: eee1b040f3c264e88ab493fca6f18a8c63231857
 SHA512:
-  metadata.gz: 8fad90037a4e1e2528772398f851f55230a4f8559eb02d621566ac092c6c9a87509581e71d40756deef82dbc3183146c77095208622d7a75f26e49e630653eeb
-  data.tar.gz: 074f845b30f457745ae7976bf8fccadea23e231d0006e8d325daa19418fece68ecdaa033e10e07f4ab875d2ee32438eff88e22849c700c08e6cae12a07f52413
+  metadata.gz: 3cc1b91d346d294d8368ba4a2e78724c47294072613896f0e5e4f60c571bcaf6520641bbd188c6d3ae80930ee9909d6e5e9136727d7bdccfbcb1fac37092eba1
+  data.tar.gz: 595ab5ab518d466eb4227d28c0d47781e588ee2b377fdd89c61d558dfa7c8f5d41095745902407d92c4cabbebe75e093aea4fb1565ff1d429d4cef6e8e038a85

data/lib/embedded_associations.rb

@@ -123,7 +123,13 @@ module EmbeddedAssociations
           r.assign_attributes(attrs)
           run_before_update_callbacks(r)
         else
-          r = current_assoc.build()
+          inheritance_column = parent.class.reflect_on_association(name).klass.inheritance_column
+          # need to pass in inheritance column in build to get correct class
+          r = if inheritance_column
+            current_assoc.build(attrs.slice(inheritance_column))
+          else
+            current_assoc.build()
+          end
           attrs = controller.send(:filter_attributes, r.class.name, attrs, :create)
           handle_resource(child_definition, r, attrs) if child_definition
           r.assign_attributes(attrs)
@@ -147,7 +153,13 @@ module EmbeddedAssociations
           r.mark_for_destruction
         end
       elsif attrs && attrs != ''
-        r = parent.send("build_#{name}")
+        inheritance_column = parent.class.reflect_on_association(name).klass.inheritance_column
+        # need to pass in inheritance column in build to get correct class
+        r = if inheritance_column
+          parent.send("build_#{name}", attrs.slice(inheritance_column))
+        else
+          parent.send("build_#{name}")
+        end
         attrs = controller.send(:filter_attributes, r.class.name, attrs, :create)
         handle_resource(child_definition, r, attrs) if child_definition
         r.assign_attributes(attrs)

data/lib/embedded_associations/version.rb

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

data/spec/embedded_associations_spec.rb

@@ -169,6 +169,29 @@ describe PostsController, type: :controller do
       end
 
     end
+    
+    context "creating with sti belongs_to" do
+
+      it "should create hierarchy" do
+        json = post :create, post: {
+          title: 'ma post',
+          user: {type: 'Admin', name: 'G$', account: {}}
+        }
+        
+        parsed_body = JSON.parse(response.body)
+        expect(parsed_body['post']['user']['type']).to eq('Admin')
+
+        expect(Post.count).to eq(1)
+        expect(User.count).to eq(1)
+        expect(Account.count).to eq(1)
+
+        resource = Post.first
+
+        expect(resource.user).to_not be_nil
+        expect(resource.user.account).to_not be_nil
+      end
+
+    end
 
     context "updating" do
 

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

@@ -45,7 +45,7 @@ class PostsController < ApplicationController
     params.require(:post).permit(
       :title,
       comments: [:content, user: [:name, :email, account: [:note] ]],
-      user: [:name, :email, account: [:note] ],
+      user: [:type, :name, :email, account: [:note] ],
       tags: [:name],
       category: [:name]
     )

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

@@ -0,0 +1,2 @@
+class Admin < User
+end

data/spec/support/app/app/serializers/admin_serializer.rb

@@ -0,0 +1,3 @@
+class AdminSerializer < UserSerializer
+  attributes :type
+end

data/spec/support/app/db/migrate/20141022213956_create_admins.rb

@@ -0,0 +1,5 @@
+class CreateAdmins < ActiveRecord::Migration
+  def change
+    add_column :users, :type, :string
+  end
+end

data/spec/support/app/db/schema.rb

@@ -9,51 +9,52 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130226001639) do
+ActiveRecord::Schema.define(version: 20141022213956) do
 
-  create_table "accounts", :force => true do |t|
+  create_table "accounts", force: true do |t|
     t.integer  "user_id"
     t.string   "note"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "categories", :force => true do |t|
+  create_table "categories", force: true do |t|
     t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "comments", :force => true do |t|
+  create_table "comments", force: true do |t|
     t.integer  "post_id"
     t.integer  "user_id"
     t.string   "content"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "posts", :force => true do |t|
+  create_table "posts", force: true do |t|
     t.string   "title"
     t.integer  "user_id"
     t.integer  "category_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "tags", :force => true do |t|
+  create_table "tags", force: true do |t|
     t.integer  "post_id"
     t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "users", :force => true do |t|
+  create_table "users", force: true do |t|
     t.string   "name"
     t.string   "email"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type"
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embedded_associations
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Gordon L. Hempton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -48,12 +48,14 @@ files:
 - spec/support/app/app/controllers/application_controller.rb
 - spec/support/app/app/controllers/posts_controller.rb
 - spec/support/app/app/models/account.rb
+- spec/support/app/app/models/admin.rb
 - spec/support/app/app/models/category.rb
 - spec/support/app/app/models/comment.rb
 - spec/support/app/app/models/post.rb
 - spec/support/app/app/models/tag.rb
 - spec/support/app/app/models/user.rb
 - spec/support/app/app/serializers/account_serializer.rb
+- spec/support/app/app/serializers/admin_serializer.rb
 - spec/support/app/app/serializers/category_serializer.rb
 - spec/support/app/app/serializers/comment_serializer.rb
 - spec/support/app/app/serializers/post_serializer.rb
@@ -81,6 +83,7 @@ files:
 - spec/support/app/db/migrate/20130225173717_create_accounts.rb
 - spec/support/app/db/migrate/20130226001629_create_tags.rb
 - spec/support/app/db/migrate/20130226001639_create_categories.rb
+- spec/support/app/db/migrate/20141022213956_create_admins.rb
 - spec/support/app/db/schema.rb
 - spec/support/app/db/seeds.rb
 - spec/support/app/lib/assets/.gitkeep
@@ -119,12 +122,14 @@ test_files:
 - spec/support/app/app/controllers/application_controller.rb
 - spec/support/app/app/controllers/posts_controller.rb
 - spec/support/app/app/models/account.rb
+- spec/support/app/app/models/admin.rb
 - spec/support/app/app/models/category.rb
 - spec/support/app/app/models/comment.rb
 - spec/support/app/app/models/post.rb
 - spec/support/app/app/models/tag.rb
 - spec/support/app/app/models/user.rb
 - spec/support/app/app/serializers/account_serializer.rb
+- spec/support/app/app/serializers/admin_serializer.rb
 - spec/support/app/app/serializers/category_serializer.rb
 - spec/support/app/app/serializers/comment_serializer.rb
 - spec/support/app/app/serializers/post_serializer.rb
@@ -152,6 +157,7 @@ test_files:
 - spec/support/app/db/migrate/20130225173717_create_accounts.rb
 - spec/support/app/db/migrate/20130226001629_create_tags.rb
 - spec/support/app/db/migrate/20130226001639_create_categories.rb
+- spec/support/app/db/migrate/20141022213956_create_admins.rb
 - spec/support/app/db/schema.rb
 - spec/support/app/db/seeds.rb
 - spec/support/app/lib/assets/.gitkeep