Merge pull request #304 from senid231/303-optional-add-default-to-changes

#303 optional add default to changes

Author: senid231

lib/json_api_client/resource.rb

@@ -35,6 +35,8 @@ class Resource
                     :request_params_class,
                     :keep_request_params,
                     instance_accessor: false
+    class_attribute :add_defaults_to_changes,
+                    instance_writer: false
     self.primary_key          = :id
     self.parser               = Parsers::Parser
     self.paginator            = Paginating::Paginator
@@ -48,6 +50,7 @@ class Resource
     self.associations         = []
     self.request_params_class = RequestParams
     self.keep_request_params = false
+    self.add_defaults_to_changes = false
 
     #:underscored_key, :camelized_key, :dasherized_key, or custom
     self.json_key_format = :underscored_key
@@ -315,9 +318,7 @@ def initialize(params = {})
       self.relationships = self.class.relationship_linker.new(self.class, params.delete(:relationships) || {})
       self.attributes = self.class.default_attributes.merge(params)
 
-      self.class.schema.each_property do |property|
-        attributes[property.name] = property.default unless attributes.has_key?(property.name) || property.default.nil?
-      end
+      setup_default_properties
 
       self.class.associations.each do |association|
         if params.has_key?(association.attr_name.to_s)
@@ -481,6 +482,15 @@ def reset_request_select!(*resource_types)
 
     protected
 
+    def setup_default_properties
+      self.class.schema.each_property do |property|
+        unless attributes.has_key?(property.name) || property.default.nil?
+          attribute_will_change!(property.name) if add_defaults_to_changes
+          attributes[property.name] = property.default
+        end
+      end
+    end
+
     def method_missing(method, *args)
       association = association_for(method)
 

test/unit/association_test.rb

@@ -46,19 +46,124 @@ class MultiWordParent < Formatted
 
 class MultiWordChild < Formatted
   belongs_to :multi_word_parent
+  self.read_only_attributes = read_only_attributes + [:multi_word_parent_id]
+
+  def self.key_formatter
+    JsonApiClient::DasherizedKeyFormatter
+  end
+
+  def self.route_formatter
+    JsonApiClient::UnderscoredKeyFormatter
+  end
+end
+
+class Account < TestResource
+  property :name
+  property :is_active, default: true
+  property :balance
+end
+
+class UserAccount < TestResource
+  self.add_defaults_to_changes = true
+  property :name
+  property :is_active, default: true
+  property :balance
 end
 
 class AssociationTest < MiniTest::Test
 
+  def test_default_properties_no_changes
+    stub_request(:post, 'http://example.com/accounts').
+        with(headers: { content_type: 'application/vnd.api+json', accept: 'application/vnd.api+json' }, body: {
+            data: {
+                type: 'accounts',
+                attributes: {
+                    name: 'foo'
+                }
+            }
+        }.to_json)
+        .to_return(headers: { content_type: 'application/vnd.api+json' }, body: {
+            data: {
+                id: '1',
+                type: 'accounts',
+                attributes: {
+                    name: 'foo',
+                    is_active: false,
+                    balance: '0.0'
+                }
+            }
+        }.to_json)
+    record = Account.new(name: 'foo')
+    assert record.save
+    assert_equal(false, record.is_active)
+    assert_equal('0.0', record.balance)
+  end
+
+  def test_default_properties_changes
+    stub_request(:post, 'http://example.com/user_accounts').
+        with(headers: { content_type: 'application/vnd.api+json', accept: 'application/vnd.api+json' }, body: {
+            data: {
+                type: 'user_accounts',
+                attributes: {
+                    name: 'foo',
+                    is_active: true
+                }
+            }
+        }.to_json)
+        .to_return(headers: { content_type: 'application/vnd.api+json' }, body: {
+            data: {
+                id: '1',
+                type: 'user_accounts',
+                attributes: {
+                    name: 'foo',
+                    is_active: true,
+                    balance: '0.0'
+                }
+            }
+        }.to_json)
+    record = UserAccount.new(name: 'foo')
+    assert record.save
+    assert_equal(true, record.is_active)
+    assert_equal('0.0', record.balance)
+  end
+
   def test_belongs_to_urls_are_formatted
-    request = stub_request(:get, "http://example.com/multi-word-parents/1/multi-word-children")
+    request = stub_request(:get, "http://example.com/multi_word_parents/1/multi_word_children")
       .to_return(headers: {content_type: "application/vnd.api+json"}, body: { data: [] }.to_json)
 
     MultiWordChild.where(multi_word_parent_id: 1).to_a
 
     assert_requested(request)
   end
 
+  def test_belongs_to_urls_create_record
+    stub_request(:post, 'http://example.com/multi_word_parents/1/multi_word_children').
+        with(headers: { content_type: 'application/vnd.api+json', accept: 'application/vnd.api+json' }, body: {
+            data: {
+                type: 'multi_word_children',
+                attributes: {
+                    foo: 'bar',
+                    'multi-word-field': true
+                }
+            }
+        }.to_json)
+        .to_return(headers: { content_type: 'application/vnd.api+json' }, body: {
+            data: {
+                    id: '2',
+                    type: 'multi_word_children',
+                    attributes: {
+                        foo: 'bar',
+                        'multi-word-field': true
+                    }
+                }
+        }.to_json)
+
+    record = MultiWordChild.new(multi_word_parent_id: 1, foo: 'bar', multi_word_field: true)
+    result = record.save
+    assert result
+    assert_equal('2', record.id)
+  end
+
   def test_load_has_one
     stub_request(:get, "http://example.com/properties/1")
       .to_return(headers: {content_type: "application/vnd.api+json"}, body: {