fix(rename-object_id): Method name object_id shouldn't be overriden

maddiesch · Feb 24, 2019 · 577f825 · 577f825
1 parent 861d943
commit 577f825
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# Version 1.2.1
+
+## Released February 23, 2019
+
+###
+
+- Feat: Allow setting a different primary id attribute.
+
+- Fix: Rename method named `#object_id`
+
+---
+
 # Version 1.2.0
 
 ## Released February 23, 2019

diff --git a/lib/onsi/resource.rb b/lib/onsi/resource.rb
@@ -154,7 +154,7 @@ def initialize(object, version = nil, includes: nil)
     def as_json(_opts = {})
       {}.tap do |root|
         root[TYPE_KEY] = type
-        root[ID_KEY]   = object_id
+        root[ID_KEY]   = object_identifier
         root[ATTRIBUTES_KEY] = generate_attributes
         append_relationships(root)
         append_meta(root)
@@ -189,7 +189,7 @@ def validate!
       end
     end
 
-    def object_id
+    def object_identifier
       attr = object.class.api_renderer(version, nil, for_render: true).id_attr
       object.send(attr).to_s
     end

diff --git a/lib/onsi/version.rb b/lib/onsi/version.rb
@@ -1,5 +1,5 @@
 module Onsi
   ##
   # The current version of Onsi
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end