ecoportal-api 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1336e02ab24ebd2ffa1ee734fa8c41ce18bb8afc892e771e38aac15c50c5ba72
-  data.tar.gz: 2e7ec0cb920b9972d666e3645d43ae3a503cd9425d968c24519712257751b14a
+  metadata.gz: d1914cfc85642ce0eb960a35e6dc4d97282940945e8a366cd2151a69fc6b7ce8
+  data.tar.gz: 31d89929059068830b89ccae88343a20643531d5165ca0e62464bf2f9a4f0576
 SHA512:
-  metadata.gz: a877e517ddb1ee1cd71e6e40806a685a2bcb09ee7a7c73726e4fbd1527175cdb0e84bf24e592cb56b7f3686ab1b6729931346636add41edf5b987156444f1942
-  data.tar.gz: d60a8dc08b2d26b28b4aeaec0bd0cf708f2a05977761554362ab848c640d5cc5f5b74b9054eddcf5f4d62f0952a24719da086bf3572ccea980c0754295d8db01
+  metadata.gz: 9325950d7ea384111f5905635b879ce83ebbc9174409f54ef63b172ad4da1d35aee37e37d97593e161c9a62449266dbcd05a1ba2da194ae2a3cbcdce72831f55
+  data.tar.gz: 68e5c643263e021dbd88eb26710c9cd549913d57164b6a53aebbb98cf8b38809525c88f0f709680fed8e926fdce88310a20956585b97d829f0fe7c86d5e5b333

data/lib/ecoportal/api/common/base_model.rb

@@ -53,14 +53,14 @@ module Ecoportal
 
         def doc
           raise UnlinkedModel.new  unless linked?
-          return _parent.doc[_key] unless _parent == self
-          @doc
+          return @doc if is_root?
+          _parent.doc.dig(*[_key].flatten)
         end
 
         def original_doc
           raise UnlinkedModel.new  unless linked?
-          return _parent.original_doc[_key] unless _parent == self
-          @original_doc
+          return @original_doc if is_root?
+          _parent.original_doc.dig(*[_key].flatten)
         end
 
         def as_json
@@ -82,21 +82,21 @@ module Ecoportal
 
         def consolidate!
           raise UnlinkedModel.new  unless linked?
-          case
-          when @original_doc
-            @original_doc = JSON.parse(@doc.to_json)
+          new_doc = JSON.parse(doc.to_json)
+          if is_root?
+            @original_doc = new_doc
           else
-            _parent.original_doc[_key] = JSON.parse(doc.to_json)
+            dig_set(_parent.original_doc, [_key].flatten, new_doc)
           end
         end
 
         def reset!
           raise UnlinkedModel.new  unless linked?
-          case
-          when @doc
-            @doc = JSON.parse(@original_doc.to_json)
+          new_doc = JSON.parse(original_doc.to_json)
+          if is_root?
+            @doc = new_doc
           else
-            _parent.doc[_key] = JSON.parse(original_doc.to_json)
+            dig_set(_parent.doc, [_key].flatten, new_doc)
           end
         end
 
@@ -107,9 +107,22 @@ module Ecoportal
 
         protected
 
+        def is_root?
+          _parent == self && !!defined?(@doc)
+        end
+
         def linked?
-          is_root = _parent == self && defined?(@doc)
-          is_root || _parent.doc[_key]
+          is_root? || !!_parent.doc.dig(*[_key].flatten)
+        end
+
+        private
+
+        def dig_set(obj, keys, value)
+          if keys.length == 1
+            obj[keys.first] = value
+          else
+            dig_set(obj[keys.first], keys.slice(1..-1), value)
+          end
         end
 
       end

data/lib/ecoportal/api/v1/person_details.rb

@@ -22,8 +22,8 @@ module Ecoportal
         # @return [Array<SchemaFieldValue>] the array of fields of the schema.
         def fields
           return @fields if defined?(@fields)
-          @fields = (doc["fields"] || []).map do |field|
-            schema_field_value_class.new(field)
+          @fields = (doc["fields"] || []).each_with_index.map do |field, i|
+            schema_field_value_class.new(field, parent: self, key: ["fields", i])
           end
         end
 

data/lib/ecoportal/api/version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tapio Saarinen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler