apiql 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07a5e72eaeb35325718dcef5da7e5edb36a15510c08214495657ddbf81e9ad70
-  data.tar.gz: 4019aa7577844d6b8b4b11c583cd3b908b95272b3b5bbd1f488e0341507d2ffb
+  metadata.gz: be1cd2e607d5b0b9f400d217c227a53826f20e5904db4caef949978580be45cf
+  data.tar.gz: cbd052428a30d779a3ab3670ca60eebf15fe095df867a7f3d3f1d19c35b7663d
 SHA512:
-  metadata.gz: 3473948636742149aba25b20224ac331c762ec1dfa8c5d9ba3297bc0811bfa51293912d4d97d5760d8042dc7989a6b3f8fc83d26e0c46c302abb26c82ab9e5e3
-  data.tar.gz: c860d4d1a179fae2e0ec6b57b806af5a49cddf66cef385f435bd6397b1a401ee8b00770c89f5b8a17ec428589dacb6be0671edbaaeb5039f90a0d922b8b4fa16
+  metadata.gz: b583b6f640c5113d3735d90358375d20cd702382b9ca6815d85a70a15473ccac3ce683cd029fe3abcb7c0e812521ff800c4c7ca3291864939592225095449723
+  data.tar.gz: 7c6090d8ab1e9ea06a181ed7c397cea36c4f6bbd0849f55f45f03fbe1506de24c06ea9a1ad3aebd8959189bd3c3ed9547434eeb56d44a0552e907fcbb1dca124

data/apiql.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'apiql'
-  spec.version       = '0.4.3'
+  spec.version       = '0.4.4'
   spec.authors       = ['Dmitry Silchenko']
   spec.email         = ['dmitry@desofto.com']
 

data/lib/apiql.rb

@@ -7,6 +7,13 @@ class APIQL
     end
   end
 
+  class ::Hash
+    def deep_merge(second)
+      merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+      self.merge(second.to_h, &merger)
+    end
+  end
+
   module CRUD
     def model(klass)
       define_method "#{klass.name.pluralize.underscore}" do |page = nil, page_size = 10|
@@ -233,7 +240,9 @@ class APIQL
             end
           end
 
-          result[name] = @context.render_value(data, sub_schema)
+          result = result.deep_merge({
+            name => @context.render_value(data, sub_schema)
+          })
         end
       else
         reg = call.match(/\A((?<alias>[\w\.]+):\s*)?(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
@@ -253,7 +262,9 @@ class APIQL
           data = nil
         end
 
-        result[name] = data
+        result = result.deep_merge({
+          name => data
+        })
       end
     end
 
@@ -306,13 +317,17 @@ class APIQL
             reg = field.match(/\A(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
             raise Error, field unless reg.present?
 
-            respond[reg[:name]] = render_attribute(reg[:name], reg[:params].presence, sub_schema)
+            respond = respond.deep_merge({
+              reg[:name] => render_attribute(reg[:name], reg[:params].presence, sub_schema)
+            })
           end
         else
           reg = field.match(/\A(?<name>[\w\.]+)(\((?<params>.*?)\))?\z/)
           raise Error, field unless reg.present?
 
-          respond[reg[:name]] = render_attribute(reg[:name], reg[:params].presence)
+          respond = respond.deep_merge({
+            reg[:name] => render_attribute(reg[:name], reg[:params].presence)
+          })
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiql
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Dmitry Silchenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler