Rename object_id to class_object_id to avoid conflict with Ruby

README.md

@@ -208,7 +208,6 @@ puts dump.inspect
 # => "{\"_class\":\"Car\",\"_id\":1,\"_instance_variables\":{\"make\":\"Mitsubishi\",\"model\":\"Eclipse\",\"owner\":{\"_class\":\"Person\",\"_id\":1,\"_instance_variables\":{\"dob\":{\"_class\":\"Time\",\"_data\":[0,2458044,50584,0,-14400,2299161.0]},\"name\":\"Sean Hux\"}},\"year\":\"2002\"},\"_classes\":[{\"_class\":\"Person\",\"_class_variables\":{\"class_count\":1},\"_instance_variables\":{\"count\":1}}]}"
 ```
 
-
 ### Deserialize
 
 [DESERIALIZE NOT FULLY IMPLEMENTED]

TODO.md

@@ -2,15 +2,15 @@
 
 ## Next
 
-- Deserialize classes and modules
 - Deserialize Struct members as JSON
 - Deserialize class variables as JSON
+- Deserialize classes and modules
+- Support `include_classes` option on load
 - Deserialize top-level Class occurence in variables as JSON
 - Deserialize top-level Module occurence in variables as JSON
 - Deal with bypassing constructor args (perhaps providing an alternative to new)
 - Serialize whether a class reference is a class or module
 - Materialize a class matching the non-existing class
-- Support `include_classes` option on load
 - Support passing `whitelist_classes` to filter by upon load
 
 ## Soon

lib/yasl/dumper.rb

@@ -159,7 +159,6 @@ def add_to_classes(object)
       classes << object unless classes.include?(object)
     end
 
-    # TODO rename object_id to something else to avoid conflict with Ruby
     def object_id(object)
       object_class_array = class_objects[class_for(object)]
       object_class_array_index = object_class_array&.index(object)

lib/yasl/loader.rb

@@ -113,8 +113,7 @@ def add_to_classes(object)
       classes << object unless classes.include?(object)
     end
 
-    # TODO rename object_id to something else to avoid conflict with Ruby
-    def object_id(object)
+    def class_object_id(object)
       object_class_array = class_objects[class_for(object)]
       object_class_array_index = object_class_array&.index(object)
       (object_class_array_index + 1) unless object_class_array_index.nil?