Allow a Form to mimic a model with an attribute with the same name

.rubocop.yml

@@ -25,7 +25,7 @@ Layout/IndentationWidth:
   Width: 2  
 
 Metrics/ClassLength:
-  Max: 110
+  Max: 115
   Exclude:
     - 'spec/**/*_spec.rb'
 

lib/rectify/form.rb

@@ -9,10 +9,10 @@ class Form
 
     def self.from_params(params, additional_params = {})
       params_hash = hash_from(params)
+      mimicked_params = ensure_hash(params_hash[mimicked_model_name])
 
       attributes_hash = params_hash
-        .fetch(mimicked_model_name, {})
-        .merge(params_hash)
+        .merge(mimicked_params)
         .merge(additional_params)
 
       formatted_attributes = FormatAttributesHash
@@ -54,6 +54,14 @@ def self.hash_from(params)
       params.with_indifferent_access
     end
 
+    def self.ensure_hash(object)
+      if object.is_a?(Hash)
+        object
+      else
+        {}
+      end
+    end
+
     def persisted?
       id.present? && id.to_i > 0
     end

spec/db/migrate/20180531090029_add_user_to_user.rb

@@ -0,0 +1,5 @@
+class AddUserToUser < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :user, :string
+  end
+end

spec/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2016_05_25_115421) do
+ActiveRecord::Schema.define(version: 2018_05_31_090029) do
 
   create_table "addresses", force: :cascade do |t|
     t.string "street", default: "", null: false
@@ -38,6 +38,7 @@
     t.boolean "active", default: true, null: false
     t.integer "address_id"
     t.datetime "last_logged_in"
+    t.string "user"
   end
 
 end

spec/fixtures/forms/user_form.rb

@@ -4,6 +4,7 @@
 class UserForm < Rectify::Form
   mimic :user
 
+  attribute :user,        String
   attribute :first_name,  String
   attribute :age,         Integer
   attribute :colours,     Array

spec/lib/rectify/form_spec.rb

@@ -1,18 +1,24 @@
 RSpec.describe Rectify::Form do
   describe ".new" do
     it "populates attributes from a string key hash" do
-      form = UserForm.new("first_name" => "Andy", "age" => 38)
+      form = UserForm.new(
+        "user" => "andy38",
+        "first_name" => "Andy",
+        "age" => 38
+      )
 
       expect(form).to have_attributes(
+        :user       => "andy38",
         :first_name => "Andy",
         :age => 38
       )
     end
 
     it "populates attributes from a symbol key hash" do
-      form = UserForm.new(:first_name => "Andy", :age => 38)
+      form = UserForm.new(:user => "andy38", :first_name => "Andy", :age => 38)
 
       expect(form).to have_attributes(
+        :user       => "andy38",
         :first_name => "Andy",
         :age => 38
       )
@@ -25,6 +31,7 @@
         "id"       => "1",
         "other_id" => "2",
         "user" => {
+          "user"       => "andy38",
           "first_name" => "Andy",
           "age"        => "38",
           "colours"    => %w[red blue green],
@@ -48,6 +55,7 @@
       form = UserForm.from_params(params)
 
       expect(form).to have_attributes(
+        :user       => "andy38",
         :first_name => "Andy",
         :age        => 38,
         :colours    => %w[red blue green]
@@ -131,6 +139,7 @@
       form = ChildForm.from_params(params)
 
       expect(form).to have_attributes(
+        :user       => "andy38",
         :first_name => "Andy",
         :age        => 38,
         :school     => "Rutlish"
@@ -161,6 +170,7 @@
   describe ".from_model" do
     let(:model) do
       User.new(
+        :user       => "andy38",
         :first_name => "Andy",
         :age        => 38,
         :contacts   => [
@@ -180,6 +190,7 @@
       form = UserForm.from_model(model)
 
       expect(form).to have_attributes(
+        :user       => "andy38",
         :first_name => "Andy",
         :age => 38
       )
@@ -217,6 +228,7 @@
     it "populates attributes from a json string" do
       json = <<-JSON
         {
+          "user": "andy38",
           "first_name": "Andy",
           "age": 38,
           "address": {
@@ -231,6 +243,7 @@
       form = UserForm.from_json(json)
 
       expect(form).to have_attributes(
+        :user       => "andy38",
         :first_name => "Andy",
         :age => 38
       )