schema_based_api 2.1.15 → 2.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f096bb076a59df02a1c9a51b348a4265b4c4bcc085ee17297873b31cafdfe70a
-  data.tar.gz: 27a50ee08425905661fd685c4c5fed9619f2e86ca78aa510a1d18b749694452c
+  metadata.gz: 671eb99ac386ee3d1592c495f9b7dccc20127d9c2acb9bb42ca68666e063f037
+  data.tar.gz: a2dd8e4bb9a3925ca6311ad0d4c830f0c33143a9ba61b5fe03d8936d94872c1f
 SHA512:
-  metadata.gz: 9bfceb05a06565d3896d4cf3cdfdffe2b99c99e034f4879cf8a83d75c15f283211ee59e7e956ad60080f52aa51a0e45f5a35cd8ca021ff9ccc829dbf5b1a9df1
-  data.tar.gz: 1ddf3166f10c7e884081ed873f926ad25ca60e5382690a5a391b13777223616189184c8bb97b11047e7e1e1ea01839e27860632dd0a0d51dceeed39f763ffb5f
+  metadata.gz: 3718763554cb07b81e96287e95e63e3528a921d2f1b0ca55e9499e21d10e58397fc0da84d7aa88d5bfbb9bfe14fc707457e2cd995bec9ccec71ff8ff377d622b
+  data.tar.gz: 6ad31a659e2076a71e2d526d2bc4b345066b8e0ba9399a736672a34bec1ee487e6220dc001d86af1a44e9f9819492da2c2d55180678f0139c5b92804f038bc71

data/lib/concerns/schema_based_api_role.rb

@@ -17,10 +17,10 @@ module SchemaBasedApiRole
         # - include: include associated models, it's a list [] of hashes {} which also 
         #       accepts the [:only, :except, :methods, :include] keys.
         cattr_accessor :json_attrs
-        @@json_attrs = {
+        @@json_attrs = SchemaBasedApi.smart_merge((json_attrs || {}), {
             except: [:lock_version],
             include: [:users]
-        }
+        })
 
         ## CUSTOM ACTIONS
         # Here you can add custom actions to be called from the API

data/lib/concerns/schema_based_api_user.rb

@@ -21,10 +21,10 @@ module SchemaBasedApiUser
         # - include: include associated models, it's a list [] of hashes {} which also 
         #       accepts the [:only, :except, :methods, :include] keys.
         cattr_accessor :json_attrs
-        @@json_attrs = {
+        @@json_attrs = SchemaBasedApi.smart_merge((json_attrs || {}), {
             except: [:lock_version],
             include: [:roles]
-        }
+        })
 
         ## CUSTOM ACTIONS
         # Here you can add custom actions to be called from the API

data/lib/schema_based_api.rb

@@ -11,6 +11,14 @@ require "simple_command"
 
 require 'concerns/api_exception_management'
 
+require 'deep_merge/rails_compat'
+
 module SchemaBasedApi
-  # Your code goes here...
+  def self.smart_merge src, dest
+      src.deeper_merge! dest, {
+          extend_existing_arrays: true, 
+          merge_hash_arrays: true
+      }
+      src
+  end
 end

data/lib/schema_based_api/version.rb

@@ -1,3 +1,3 @@
 module SchemaBasedApi
-  VERSION = '2.1.15'
+  VERSION = '2.1.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_based_api
 version: !ruby/object:Gem::Version
-  version: 2.1.15
+  version: 2.1.16
 platform: ruby
 authors:
 - Gabriele Tassoni
@@ -142,6 +142,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement