thecore_auth_commons 3.5.14 → 3.5.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f66435a76d0089d6e52de71c3fc7239470ec7c91ca241ba242bce9a5d1bdea1d
4
- data.tar.gz: b9130fc3d425a86abb0b8c83a0880aedc6be121a2cf634e2e5821320d2a27e2e
3
+ metadata.gz: 2a5d019d73046f1ba808347236d3e26474d57f7f72c15e5f616d667271d6164e
4
+ data.tar.gz: bd140a9026819eaca4e6fe0759ade000115b5aa74785ade45d9963985eb753cb
5
5
  SHA512:
6
- metadata.gz: 5ac374cf84bf7220b9c74f27732bf1f4723b60f11970594c20f6ef9544b00e4e2eaef5e4c0170ea6cb515846958dd05b3ed5cc57f3366ba9fec175678550ad50
7
- data.tar.gz: a55c49bb2b11e7486d3603b8f9719380cdb535f2dd1f36d1f746643afe6f269747cbaa51f6a8fed362db379426990bd6dbbfab352384f86826a466afd270f78f
6
+ metadata.gz: 96510a81f013f4ad7503844d9daf60c2f7292b038c43cb245d8fe519c164eadaeab710022593a75a8fd61322f9842c2e2019505dfdc39a524745d8c829bce7fc
7
+ data.tar.gz: d2992fec30b632567a9781fe5d3af2d479f6829d6390ee25403f2da932a611ecaf57c915a00606e8b010bc3e7b62803ca5375e3c2ed4e4a4e1f566d7264bfdfb
@@ -12,7 +12,9 @@ module Api::LdapServer
12
12
  # - methods: include the result of some method defined in the model
13
13
  # - include: include associated models, it's an object {} which also accepts the keys described here
14
14
  cattr_accessor :json_attrs
15
- self.json_attrs = ::ModelDrivenApi.smart_merge (json_attrs || {}), {}
15
+ # No ::ModelDrivenApi.smart_merge here: this is the lowest Thecore layer and model_driven_api
16
+ # (which sits above it) is not a dependency; merging {} was a no-op anyway.
17
+ self.json_attrs = json_attrs || {}
16
18
 
17
19
  # Custom action callable by the API must be defined in /app/models/concerns/endpoints/
18
20
  end
@@ -2,9 +2,13 @@ module RailsAdmin::LdapServer
2
2
  extend ActiveSupport::Concern
3
3
 
4
4
  included do
5
- rails_admin do
6
- navigation_label I18n.t('admin.settings.label')
7
- navigation_icon 'fa fa-passport'
5
+ # rails_admin is not a dependency of this gem (thecore_ui_rails_admin, a layer above, brings
6
+ # it): configure only when RailsAdmin is loaded, so apps/dummies without it can load the model.
7
+ if respond_to?(:rails_admin)
8
+ rails_admin do
9
+ navigation_label I18n.t('admin.settings.label')
10
+ navigation_icon 'fa fa-passport'
11
+ end
8
12
  end
9
13
  end
10
14
  end
@@ -1,3 +1,3 @@
1
1
  module ThecoreAuthCommons
2
- VERSION = "3.5.14".freeze
2
+ VERSION = "3.5.15".freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: thecore_auth_commons
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.5.14
4
+ version: 3.5.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gabriele Tassoni
@@ -212,19 +212,19 @@ dependencies:
212
212
  - !ruby/object:Gem::Version
213
213
  version: '2.18'
214
214
  - !ruby/object:Gem::Dependency
215
- name: sqlite3
215
+ name: pg
216
216
  requirement: !ruby/object:Gem::Requirement
217
217
  requirements:
218
- - - ">="
218
+ - - "~>"
219
219
  - !ruby/object:Gem::Version
220
- version: '0'
220
+ version: '1.1'
221
221
  type: :development
222
222
  prerelease: false
223
223
  version_requirements: !ruby/object:Gem::Requirement
224
224
  requirements:
225
- - - ">="
225
+ - - "~>"
226
226
  - !ruby/object:Gem::Version
227
- version: '0'
227
+ version: '1.1'
228
228
  - !ruby/object:Gem::Dependency
229
229
  name: actionmailer
230
230
  requirement: !ruby/object:Gem::Requirement