Merge pull request #326 from senid231/ensure-correct-changes-on-resource-init

correct changes after initialize resource

Author: senid231

CHANGELOG.md

@@ -10,6 +10,10 @@
 
 - [#328](https://github.com/JsonApiClient/json_api_client/pull/328) - allow custom type for models
 
+- [#326](https://github.com/JsonApiClient/json_api_client/pull/326) - correct changes after initialize resource
+  * remove type from changes on initialize
+  * ensure that query builder doesn't propagate query values to resource attributes via #build method
+
 ## 1.7.0
 
 - [#320](https://github.com/JsonApiClient/json_api_client/pull/320) - fix passing relationships on create

lib/json_api_client/helpers/dirty.rb

@@ -18,6 +18,10 @@ def clear_changes_information
         @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
       end
 
+      def forget_change!(attr)
+        @changed_attributes.delete(attr.to_s)
+      end
+
       def set_all_attributes_dirty
         attributes.each do |k, v|
           set_attribute_was(k, v)
@@ -68,4 +72,4 @@ def set_attribute(name, value)
 
     end
   end
-end
+end

lib/json_api_client/resource.rb

@@ -329,6 +329,7 @@ def initialize(params = {})
       self.links = self.class.linker.new(params.delete(:links) || {})
       self.relationships = self.class.relationship_linker.new(self.class, params.delete(:relationships) || {})
       self.attributes = self.class.default_attributes.merge params.except(*self.class.prefix_params)
+      self.forget_change!(:type)
       self.__belongs_to_params = params.slice(*self.class.prefix_params)
 
       setup_default_properties

test/test_helper.rb

@@ -22,6 +22,12 @@ class Article < TestResource
   has_one :author
 end
 
+class ArticleNested < TestResource
+  belongs_to :author, shallow_path: true
+  has_many :comments
+  has_one :author
+end
+
 class Person < TestResource
 end
 

test/unit/query_builder_test.rb

@@ -256,4 +256,27 @@ def test_find_with_args
     assert_requested all_stub, times: 1
     assert_requested find_stub, times: 1
   end
+
+  def test_build_does_not_propagate_values
+    query = Article.where(name: 'John').
+        includes(:author).
+        order(id: :desc).
+        select(:id, :name).
+        page(1).
+        per(20).
+        with_params(sort: "foo")
+
+    record = query.build
+    assert_equal [], record.changed
+    assert_equal [], record.relationships.changed
+  end
+
+  def test_build_propagate_only_path_params
+    query = ArticleNested.where(author_id: '123', name: 'John')
+    record = query.build
+    assert_equal [], record.changed
+    assert_equal({author_id: '123'}, record.__belongs_to_params)
+    assert_equal '123', record.author_id
+    assert_equal [], record.relationships.changed
+  end
 end