brick 1.0.204 → 1.0.206
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/brick/config.rb +3 -3
- data/lib/brick/extensions.rb +58 -61
- data/lib/brick/frameworks/rails/engine.rb +126 -59
- data/lib/brick/frameworks/rails/form_tags.rb +2 -2
- data/lib/brick/reflect_tables.rb +2 -55
- data/lib/brick/version_number.rb +1 -1
- data/lib/brick.rb +2 -7
- data/lib/generators/brick/install_generator.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7cd4c557cd4baa06fc68ab683444da5b018c1c0c63436d36d7648c259167c418
|
4
|
+
data.tar.gz: 62d2260128b72a0a6db5d0af14054ae9518e4516ccf18a04010d2e187c8768d2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 43743d8447db6daa39e2fc506e7eef3260ba63abc3a4cb4990ace1d33e56e38d15dd7eaf9c9bbdb2873ea2b5dae6d308c12bd04ea2f073b04fefccac564ee3e3
|
7
|
+
data.tar.gz: 144317e91f03fdf2ca66db2c78d8f851e9ab21c4c016190ad3a48ef97a3594f2df8125a1d4f4a59214501429e1c16b6baca9878c22bb2d026eeee20a83929f53
|
data/lib/brick/config.rb
CHANGED
@@ -234,7 +234,7 @@ module Brick
|
|
234
234
|
|
235
235
|
# Polymorphic associations
|
236
236
|
def polymorphics
|
237
|
-
@mutex.synchronize { @polymorphics }
|
237
|
+
@mutex.synchronize { @polymorphics ||= {} }
|
238
238
|
end
|
239
239
|
|
240
240
|
def polymorphics=(polys)
|
@@ -344,7 +344,7 @@ module Brick
|
|
344
344
|
end
|
345
345
|
|
346
346
|
def table_name_prefixes
|
347
|
-
@mutex.synchronize { @table_name_prefixes }
|
347
|
+
@mutex.synchronize { @table_name_prefixes ||= {} }
|
348
348
|
end
|
349
349
|
|
350
350
|
def table_name_prefixes=(value)
|
@@ -384,7 +384,7 @@ module Brick
|
|
384
384
|
end
|
385
385
|
|
386
386
|
def metadata_columns
|
387
|
-
@mutex.synchronize { @metadata_columns }
|
387
|
+
@mutex.synchronize { @metadata_columns ||= ['created_at', 'updated_at', 'deleted_at'] }
|
388
388
|
end
|
389
389
|
|
390
390
|
def metadata_columns=(columns)
|
data/lib/brick/extensions.rb
CHANGED
@@ -536,10 +536,35 @@ module ActiveRecord
|
|
536
536
|
class Relation
|
537
537
|
attr_accessor :_brick_page_num
|
538
538
|
|
539
|
-
# Links from ActiveRecord association pathing names over to real table
|
540
|
-
# that get chosen when the AREL AST tree is walked.
|
539
|
+
# Links from ActiveRecord association pathing names over to the real table
|
540
|
+
# correlation names that get chosen when the AREL AST tree is walked.
|
541
541
|
def brick_links
|
542
|
-
|
542
|
+
# Touching AREL AST walks the JoinDependency tree, and in that process uses our
|
543
|
+
# "brick_links" patch to find how every AR chain of association names relates to exact
|
544
|
+
# table correlation names chosen by AREL. We use a duplicate relation object for this
|
545
|
+
# because an important side-effect of referencing the AST is that the @arel instance
|
546
|
+
# variable gets set, and this is a signal to ActiveRecord that a relation has now
|
547
|
+
# become immutable. (We aren't quite ready for our "real deal" relation object to be
|
548
|
+
# set in stone ... still need to add .select(), and possibly .where() and .order()
|
549
|
+
# things ... also if there are any HM counts then an OUTER JOIN for each of them out
|
550
|
+
# to a derived table to do that counting. All of these things need to know proper
|
551
|
+
# table correlation names, which will now become available from brick_links on the
|
552
|
+
# @_brick_rel_dupe object.)
|
553
|
+
@_brick_links ||= begin
|
554
|
+
# If it's a CollectionProxy (which inherits from Relation) then need to dig
|
555
|
+
# out the core Relation object which is found in the association scope.
|
556
|
+
rel_dupe = (is_a?(ActiveRecord::Associations::CollectionProxy) ? scope : self).dup
|
557
|
+
# This will become a fully populated hash of correlation names
|
558
|
+
rel_dupe.instance_variable_set(:@_brick_links, bl = { '' => table_name })
|
559
|
+
# Walk the AST tree in order to capture all the correlation names
|
560
|
+
rel_dupe.arel.ast
|
561
|
+
# Now that @_brick_links are captured, we can garbage collect the @_brick_rel_dupe object
|
562
|
+
# remove_instance_variable(:@_brick_rel_dupe)
|
563
|
+
bl
|
564
|
+
end
|
565
|
+
# if @_brick_rel_dupe
|
566
|
+
# end
|
567
|
+
# @_brick_links
|
543
568
|
end
|
544
569
|
|
545
570
|
def brick_select(*args, params: {}, order_by: nil, translations: {},
|
@@ -648,23 +673,6 @@ module ActiveRecord
|
|
648
673
|
end
|
649
674
|
end
|
650
675
|
|
651
|
-
# If it's a CollectionProxy (which inherits from Relation) then need to dig out the
|
652
|
-
# core Relation object which is found in the association scope.
|
653
|
-
rel_dupe = (is_a?(ActiveRecord::Associations::CollectionProxy) ? scope : self).dup
|
654
|
-
|
655
|
-
# Touching AREL AST walks the JoinDependency tree, and in that process uses our
|
656
|
-
# "brick_links" patch to find how every AR chain of association names relates to exact
|
657
|
-
# table correlation names chosen by AREL. We use a duplicate relation object for this
|
658
|
-
# because an important side-effect of referencing the AST is that the @arel instance
|
659
|
-
# variable gets set, and this is a signal to ActiveRecord that a relation has now
|
660
|
-
# become immutable. (We aren't quite ready for our "real deal" relation object to be
|
661
|
-
# set in stone ... still need to add .select(), and possibly .where() and .order()
|
662
|
-
# things ... also if there are any HM counts then an OUTER JOIN for each of them out
|
663
|
-
# to a derived table to do that counting. All of these things need to know proper
|
664
|
-
# table correlation names, which will now become available in brick_links on the
|
665
|
-
# rel_dupe object.)
|
666
|
-
rel_dupe.arel.ast
|
667
|
-
|
668
676
|
core_selects = selects.dup
|
669
677
|
id_for_tables = Hash.new { |h, k| h[k] = [] }
|
670
678
|
field_tbl_names = Hash.new { |h, k| h[k] = {} }
|
@@ -673,7 +681,7 @@ module ActiveRecord
|
|
673
681
|
# CUSTOM COLUMNS
|
674
682
|
# ==============
|
675
683
|
(cust_col_override || klass._br_cust_cols).each do |k, cc|
|
676
|
-
if
|
684
|
+
if respond_to?(k) # Name already taken?
|
677
685
|
# %%% Use ensure_unique here in this kind of fashion:
|
678
686
|
# cnstr_name = ensure_unique(+"(brick) #{for_tbl}_#{pri_tbl}", nil, bts, hms)
|
679
687
|
# binding.pry
|
@@ -690,7 +698,7 @@ module ActiveRecord
|
|
690
698
|
# binding.pry unless kl.reflect_on_association(cc_part_term)
|
691
699
|
kl.reflect_on_association(cc_part_term)&.klass || klass
|
692
700
|
end
|
693
|
-
tbl_name =
|
701
|
+
tbl_name = brick_links[cc_part[0..-2].map(&:to_s).join('.')]
|
694
702
|
# Deal with the conflict if there are two parts in the custom column named the same,
|
695
703
|
# "category.name" and "product.name" for instance will end up with aliases of "name"
|
696
704
|
# and "product__name".
|
@@ -734,19 +742,19 @@ module ActiveRecord
|
|
734
742
|
unless cust_col_override
|
735
743
|
klass._br_bt_descrip.each do |v|
|
736
744
|
v.last.each do |k1, v1| # k1 is class, v1 is array of columns to snag
|
737
|
-
next unless (tbl_name =
|
745
|
+
next unless (tbl_name = brick_links[v.first.to_s]&.split('.')&.last)
|
738
746
|
|
739
747
|
# If it's Oracle, quote any AREL aliases that had been applied
|
740
|
-
tbl_name = "\"#{tbl_name}\"" if ::Brick.is_oracle &&
|
748
|
+
tbl_name = "\"#{tbl_name}\"" if ::Brick.is_oracle && brick_links.values.include?(tbl_name)
|
741
749
|
field_tbl_name = nil
|
742
750
|
v1.map { |x| [x[0..-2].map(&:to_s).join('.'), x.last] }.each_with_index do |sel_col, idx|
|
743
751
|
# %%% Strangely in Rails 7.1 on a slower system then very rarely brick_link comes back nil...
|
744
|
-
brick_link =
|
752
|
+
brick_link = brick_links[sel_col.first]
|
745
753
|
field_tbl_name = brick_link&.split('.')&.last ||
|
746
754
|
# ... so here's a best-effort guess for what the table name might be.
|
747
|
-
|
755
|
+
klass.reflect_on_association(sel_col.first)&.klass&.table_name
|
748
756
|
# If it's Oracle, quote any AREL aliases that had been applied
|
749
|
-
field_tbl_name = "\"#{field_tbl_name}\"" if ::Brick.is_oracle &&
|
757
|
+
field_tbl_name = "\"#{field_tbl_name}\"" if ::Brick.is_oracle && brick_links.values.include?(field_tbl_name)
|
750
758
|
|
751
759
|
# Postgres can not use DISTINCT with any columns that are XML, so for any of those just convert to text
|
752
760
|
is_xml = is_distinct && Brick.relations[k1.table_name]&.[](:cols)&.[](sel_col.last)&.first&.start_with?('xml')
|
@@ -788,7 +796,7 @@ module ActiveRecord
|
|
788
796
|
join_array.each do |assoc_name|
|
789
797
|
next unless assoc_name.is_a?(Symbol)
|
790
798
|
|
791
|
-
table_alias =
|
799
|
+
table_alias = brick_links[assoc_name.to_s]
|
792
800
|
_assoc_names[assoc_name] = [table_alias, klass]
|
793
801
|
end
|
794
802
|
end
|
@@ -931,7 +939,7 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
|
|
931
939
|
if (v_parts = v.first.split('.')).length == 1
|
932
940
|
(is_not ? where_nots : s)[v.first] = v.last
|
933
941
|
else
|
934
|
-
tbl_name =
|
942
|
+
tbl_name = brick_links[v_parts.first].split('.').last
|
935
943
|
(is_not ? where_nots : s)["#{tbl_name}.#{v_parts.last}"] = v.last
|
936
944
|
end
|
937
945
|
end
|
@@ -1042,10 +1050,9 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
|
|
1042
1050
|
else
|
1043
1051
|
self.joins!(ja)
|
1044
1052
|
end
|
1045
|
-
(ast_tree = self.dup).arel.ast # Walk the AST tree so we can rewrite the prefixes accordingly
|
1046
1053
|
conditions = opts.each_with_object({}) do |v, s|
|
1047
1054
|
if (ref_parts = v.first.split('.')).length > 1 &&
|
1048
|
-
(tbl =
|
1055
|
+
(tbl = brick_links[ref_parts[0..-2].join('.')])
|
1049
1056
|
s["#{tbl}.#{ref_parts.last}"] = v.last
|
1050
1057
|
else
|
1051
1058
|
s[v.first] = v.last
|
@@ -1175,34 +1182,6 @@ Might want to add this in your brick.rb:
|
|
1175
1182
|
end
|
1176
1183
|
end
|
1177
1184
|
|
1178
|
-
if ::Brick.enable_routes? && Object.const_defined?('ActionDispatch')
|
1179
|
-
require 'brick/route_mapper'
|
1180
|
-
ActionDispatch::Routing::RouteSet.class_exec do
|
1181
|
-
# In order to defer auto-creation of any routes that already exist, calculate Brick routes only after having loaded all others
|
1182
|
-
prepend ::Brick::RouteSet
|
1183
|
-
end
|
1184
|
-
ActionDispatch::Routing::Mapper.class_exec do
|
1185
|
-
include ::Brick::RouteMapper
|
1186
|
-
end
|
1187
|
-
|
1188
|
-
# Do the root route before the Rails Welcome one would otherwise take precedence
|
1189
|
-
if (route = ::Brick.config.default_route_fallback).present?
|
1190
|
-
action = "#{route}#{'#index' unless route.index('#')}"
|
1191
|
-
if ::Brick.config.path_prefix
|
1192
|
-
::Rails.application.routes.append do
|
1193
|
-
send(:namespace, ::Brick.config.path_prefix) do
|
1194
|
-
send(:root, action)
|
1195
|
-
end
|
1196
|
-
end
|
1197
|
-
elsif ::Rails.application.routes.named_routes.send(:routes)[:root].nil?
|
1198
|
-
::Rails.application.routes.append do
|
1199
|
-
send(:root, action)
|
1200
|
-
end
|
1201
|
-
end
|
1202
|
-
::Brick.established_drf = "/#{::Brick.config.path_prefix}#{action[action.index('#')..-1]}"
|
1203
|
-
end
|
1204
|
-
end
|
1205
|
-
|
1206
1185
|
if Object.const_defined?('ActionView')
|
1207
1186
|
require 'brick/frameworks/rails/form_tags'
|
1208
1187
|
require 'brick/frameworks/rails/form_builder'
|
@@ -1343,10 +1322,15 @@ end
|
|
1343
1322
|
# Try to require the respective Ruby file
|
1344
1323
|
# ((filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore)) &&
|
1345
1324
|
# (require_dependency(filename) || true) &&
|
1346
|
-
(
|
1325
|
+
(!anonymous? &&
|
1326
|
+
(filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore) ||
|
1347
1327
|
(self != Object && ActiveSupport::Dependencies.search_for_file((desired_classname = requested).underscore))
|
1348
1328
|
) && (require_dependency(filename) || true) &&
|
1349
|
-
(
|
1329
|
+
(filename != Module.instance_variable_get(:@_brick_last_filename) || # Avoid trying the same exact file twice in a row
|
1330
|
+
Module.instance_variable_set(:@_brick_last_filename, nil)) &&
|
1331
|
+
Module.instance_variable_set(:@_brick_last_filename, filename) &&
|
1332
|
+
|
1333
|
+
(possible = self.const_get(args.first)) && possible.name == desired_classname
|
1350
1334
|
) ||
|
1351
1335
|
|
1352
1336
|
# If any class has turned up so far (and we're not in the middle of eager loading)
|
@@ -1365,6 +1349,7 @@ end
|
|
1365
1349
|
return possible
|
1366
1350
|
end
|
1367
1351
|
end
|
1352
|
+
Module.instance_variable_set(:@_brick_last_filename, nil) # Clear out the check for trying the same exact file twice in a row
|
1368
1353
|
end
|
1369
1354
|
class_name = ::Brick.namify(requested)
|
1370
1355
|
is_avo_present = Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace)
|
@@ -1800,6 +1785,18 @@ class Object
|
|
1800
1785
|
new_model_class.send(:has_many, hmt_name.to_sym, **options)
|
1801
1786
|
end
|
1802
1787
|
end
|
1788
|
+
|
1789
|
+
# Auto-support Ransack if it's present
|
1790
|
+
if self.respond_to?(:ransackable_attributes)
|
1791
|
+
def self.ransackable_attributes(auth_object = nil)
|
1792
|
+
column_names + _ransackers.keys
|
1793
|
+
end
|
1794
|
+
|
1795
|
+
def self.ransackable_associations(auth_object = nil)
|
1796
|
+
reflect_on_all_associations.map { |a| a.name.to_s } + _ransackers.keys
|
1797
|
+
end
|
1798
|
+
end
|
1799
|
+
|
1803
1800
|
code << "end # model #{full_name}\n"
|
1804
1801
|
end # model class definition
|
1805
1802
|
[built_model, code]
|
@@ -209,51 +209,95 @@ function linkSchemas() {
|
|
209
209
|
# paths['app/models'] << 'lib/brick/frameworks/active_record/models'
|
210
210
|
config.brick = ActiveSupport::OrderedOptions.new
|
211
211
|
ActiveSupport.on_load(:before_initialize) do |app|
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
212
|
+
|
213
|
+
# --------------------------------------------
|
214
|
+
# 1. Load three initializers early
|
215
|
+
# (inflectsions.rb, brick.rb, apartment.rb)
|
216
|
+
# Very first thing, load inflections since we'll be using .pluralize and .singularize on table and model names
|
217
|
+
if File.exist?(inflections = ::Rails.root&.join('config/initializers/inflections.rb') || '')
|
218
|
+
load inflections
|
216
219
|
end
|
217
220
|
require 'brick/join_array'
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
# Columns for which to add a validate presence: true even though the database doesn't have them marked as NOT NULL
|
235
|
-
::Brick.not_nullables = app.config.brick.fetch(:not_nullables, [])
|
236
|
-
|
237
|
-
# Additional references (virtual foreign keys)
|
238
|
-
::Brick.additional_references = app.config.brick.fetch(:additional_references, nil)
|
239
|
-
|
240
|
-
# Custom columns to add to a table, minimally defined with a name and DSL string
|
241
|
-
::Brick.custom_columns = app.config.brick.fetch(:custom_columns, nil)
|
242
|
-
|
243
|
-
# When table names have specific prefixes, automatically place them in their own module with a table_name_prefix.
|
244
|
-
::Brick.order = app.config.brick.fetch(:order, {})
|
221
|
+
# Now the Brick initializer since there may be important schema things configured
|
222
|
+
if !::Brick.initializer_loaded && File.exist?(brick_initializer = ::Rails.root&.join('config/initializers/brick.rb') || '')
|
223
|
+
::Brick.initializer_loaded = load brick_initializer
|
224
|
+
|
225
|
+
# After loading the initializer, add compatibility for ActiveStorage and ActionText if those haven't already been
|
226
|
+
# defined. (Further JSON configuration for ActiveStorage metadata happens later in the after_initialize hook.)
|
227
|
+
# begin
|
228
|
+
['ActiveStorage', 'ActionText'].each do |ar_extension|
|
229
|
+
if Object.const_defined?(ar_extension) &&
|
230
|
+
(extension = Object.const_get(ar_extension)).respond_to?(:table_name_prefix) &&
|
231
|
+
!::Brick.config.table_name_prefixes.key?(as_tnp = extension.table_name_prefix)
|
232
|
+
::Brick.config.table_name_prefixes[as_tnp] = ar_extension
|
233
|
+
end
|
234
|
+
end
|
235
|
+
# rescue # NoMethodError
|
236
|
+
# end
|
245
237
|
|
246
|
-
|
247
|
-
|
238
|
+
# Support the followability gem: https://github.com/nejdetkadir/followability
|
239
|
+
if Object.const_defined?('Followability') && !::Brick.config.table_name_prefixes.key?('followability_')
|
240
|
+
::Brick.config.table_name_prefixes['followability_'] = 'Followability'
|
241
|
+
end
|
242
|
+
end
|
243
|
+
# Load the initializer for the Apartment gem a little early so that if .excluded_models and
|
244
|
+
# .default_schema are specified then we can work with non-tenanted models more appropriately
|
245
|
+
if (apartment = Object.const_defined?('Apartment')) &&
|
246
|
+
File.exist?(apartment_initializer = ::Rails.root.join('config/initializers/apartment.rb'))
|
247
|
+
require 'apartment/adapters/abstract_adapter'
|
248
|
+
Apartment::Adapters::AbstractAdapter.class_exec do
|
249
|
+
if instance_methods.include?(:process_excluded_models)
|
250
|
+
def process_excluded_models
|
251
|
+
# All other models will share a connection (at Apartment.connection_class) and we can modify at will
|
252
|
+
Apartment.excluded_models.each do |excluded_model|
|
253
|
+
begin
|
254
|
+
process_excluded_model(excluded_model)
|
255
|
+
rescue NameError => e
|
256
|
+
(@bad_models ||= []) << excluded_model
|
257
|
+
end
|
258
|
+
end
|
259
|
+
end
|
260
|
+
end
|
261
|
+
end
|
262
|
+
unless @_apartment_loaded
|
263
|
+
load apartment_initializer
|
264
|
+
@_apartment_loaded = true
|
265
|
+
end
|
266
|
+
end
|
248
267
|
|
249
|
-
|
250
|
-
|
268
|
+
if ::Brick.enable_routes? && Object.const_defined?('ActionDispatch')
|
269
|
+
require 'brick/route_mapper'
|
270
|
+
ActionDispatch::Routing::RouteSet.class_exec do
|
271
|
+
# In order to defer auto-creation of any routes that already exist, calculate Brick routes only after having loaded all others
|
272
|
+
prepend ::Brick::RouteSet
|
273
|
+
end
|
274
|
+
ActionDispatch::Routing::Mapper.class_exec do
|
275
|
+
include ::Brick::RouteMapper
|
276
|
+
end
|
251
277
|
|
252
|
-
|
253
|
-
|
278
|
+
# Do the root route before the Rails Welcome one would otherwise take precedence
|
279
|
+
if (route = ::Brick.config.default_route_fallback).present?
|
280
|
+
action = "#{route}#{'#index' unless route.index('#')}"
|
281
|
+
if ::Brick.config.path_prefix
|
282
|
+
::Rails.application.routes.append do
|
283
|
+
send(:namespace, ::Brick.config.path_prefix) do
|
284
|
+
send(:root, action)
|
285
|
+
end
|
286
|
+
end
|
287
|
+
elsif ::Rails.application.routes.named_routes.send(:routes)[:root].nil?
|
288
|
+
::Rails.application.routes.append do
|
289
|
+
send(:root, action)
|
290
|
+
end
|
291
|
+
end
|
292
|
+
::Brick.established_drf = "/#{::Brick.config.path_prefix}#{action[action.index('#')..-1]}"
|
293
|
+
end
|
294
|
+
end
|
254
295
|
|
255
|
-
|
256
|
-
|
296
|
+
if ::Rails.application.respond_to?(:reloader)
|
297
|
+
::Rails.application.reloader.to_prepare { Module.class_exec &::Brick::ADD_CONST_MISSING }
|
298
|
+
else # For Rails < 5.0, just load it once at the start
|
299
|
+
Module.class_exec &::Brick::ADD_CONST_MISSING
|
300
|
+
end
|
257
301
|
end
|
258
302
|
|
259
303
|
# After we're initialized and before running the rest of stuff, put our configuration in place
|
@@ -497,20 +541,43 @@ window.addEventListener(\"popstate\", linkSchemas);
|
|
497
541
|
end
|
498
542
|
end
|
499
543
|
end
|
500
|
-
::ActiveAdmin::Views
|
501
|
-
|
502
|
-
|
503
|
-
|
504
|
-
|
505
|
-
|
506
|
-
|
507
|
-
|
508
|
-
|
509
|
-
|
510
|
-
|
511
|
-
|
512
|
-
|
513
|
-
|
544
|
+
if (aav = ::ActiveAdmin::Views).const_defined?('TitleBar') # ActiveAdmin < 4.0
|
545
|
+
aav::TitleBar.class_exec do
|
546
|
+
alias _brick_build_title_tag build_title_tag
|
547
|
+
def build_title_tag
|
548
|
+
if klass = begin
|
549
|
+
aa_id = helpers.instance_variable_get(:@current_tab)&.id
|
550
|
+
::Brick.relations.fetch(aa_id, nil)&.fetch(:class_name, nil)&.constantize
|
551
|
+
rescue
|
552
|
+
end
|
553
|
+
h2((@title + link_to_brick(nil,
|
554
|
+
BRICK_SVG.html_safe, # This would do well to be sized a bit smaller
|
555
|
+
{ title: "#{@_name} in Brick" }
|
556
|
+
)).html_safe)
|
557
|
+
else
|
558
|
+
_brick_build_title_tag # Revert to the original
|
559
|
+
end
|
560
|
+
end
|
561
|
+
end
|
562
|
+
else # ActiveAdmin 4.0 or later
|
563
|
+
is_aa_4x = true
|
564
|
+
::ActiveAdmin::ResourceController.class_exec do
|
565
|
+
include ActionView::Helpers::UrlHelper
|
566
|
+
include ::Brick::Rails::FormTags
|
567
|
+
alias _brick_default_page_title default_page_title
|
568
|
+
def default_page_title
|
569
|
+
dpt = _brick_default_page_title
|
570
|
+
if klass = begin
|
571
|
+
::Brick.relations.fetch(@current_menu_item&.id, nil)&.fetch(:class_name, nil)&.constantize
|
572
|
+
rescue
|
573
|
+
end
|
574
|
+
(dpt + link_to_brick(nil,
|
575
|
+
BRICK_SVG.html_safe,
|
576
|
+
{ title: "#{dpt} in Brick" }
|
577
|
+
)).html_safe
|
578
|
+
else
|
579
|
+
dpt
|
580
|
+
end
|
514
581
|
end
|
515
582
|
end
|
516
583
|
end
|
@@ -523,9 +590,8 @@ window.addEventListener(\"popstate\", linkSchemas);
|
|
523
590
|
div class: "blank_slate_container", id: "dashboard_default_message" do
|
524
591
|
span class: "blank_slate" do
|
525
592
|
span I18n.t("active_admin.dashboard_welcome.welcome")
|
526
|
-
small I18n.t("active_admin.dashboard_welcome.call_to_action")
|
527
593
|
end
|
528
|
-
end
|
594
|
+
end unless is_aa_4x
|
529
595
|
end
|
530
596
|
end
|
531
597
|
end
|
@@ -1402,7 +1468,7 @@ end %>#{"
|
|
1402
1468
|
end
|
1403
1469
|
\"<tr><td colspan=\\\"#\{td_count}\\\">Children: #\{child_links.join(' ')}</tr>\".html_safe
|
1404
1470
|
end
|
1405
|
-
%><%= if (page_num = @#{res_name = table_name.pluralize}
|
1471
|
+
%><%= if (page_num = @#{res_name = table_name.pluralize}&._brick_page_num)
|
1406
1472
|
\"<tr><td colspan=\\\"#\{td_count}\\\">Page #\{page_num}</td></tr>\".html_safe
|
1407
1473
|
end %></table>#{template_link}<%
|
1408
1474
|
if description.present? %><span class=\"__brick\"><%=
|
@@ -1790,11 +1856,12 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
|
|
1790
1856
|
<link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.jsdelivr.net/npm/trix@2.0/dist/trix.min.css\">
|
1791
1857
|
<% end %>
|
1792
1858
|
|
1793
|
-
<% #
|
1859
|
+
<% # Good up until v0.19.0, and then with v0.20.0 of vanilla-jsoneditor started to get:
|
1860
|
+
# Uncaught TypeError: Failed to resolve module specifier \"immutable-json-patch\". Relative references must start with either \"/\", \"./\", or \"../\".
|
1794
1861
|
if @_json_fields_present %>
|
1795
|
-
<link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.jsdelivr.net/npm/vanilla-jsoneditor/themes/jse-theme-default.min.css\">
|
1862
|
+
<link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.jsdelivr.net/npm/vanilla-jsoneditor@0.19.0/themes/jse-theme-default.min.css\">
|
1796
1863
|
<script type=\"module\">
|
1797
|
-
import { JSONEditor } from \"https://cdn.jsdelivr.net/npm/vanilla-jsoneditor/index.min.js\";
|
1864
|
+
import { JSONEditor } from \"https://cdn.jsdelivr.net/npm/vanilla-jsoneditor@0.19.0/index.min.js\";
|
1798
1865
|
document.querySelectorAll(\"input.jsonpicker\").forEach(function (inp) {
|
1799
1866
|
var jsonDiv;
|
1800
1867
|
if (jsonDiv = document.getElementById(\"_br_json_\" + inp.id)) {
|
@@ -69,8 +69,8 @@ module Brick::Rails::FormTags
|
|
69
69
|
|
70
70
|
if show_aa_button != false && Object.const_defined?('ActiveAdmin')
|
71
71
|
ActiveAdmin.application.namespaces.names.each do |ns|
|
72
|
-
|
73
|
-
|
72
|
+
out << "
|
73
|
+
<td>#{link_to_brick(
|
74
74
|
::Brick::Rails::AA_PNG.html_safe,
|
75
75
|
{ index_proc: Proc.new do |aa_model, relation|
|
76
76
|
path_helper = "#{ns}_#{relation.fetch(:auto_prefixed_schema, nil)}#{aa_model.model_name.route_key}_path".to_sym
|
data/lib/brick/reflect_tables.rb
CHANGED
@@ -31,61 +31,8 @@ module Brick
|
|
31
31
|
|
32
32
|
orig_schema = nil
|
33
33
|
if (relations = ::Brick.relations).keys == [:db_name]
|
34
|
-
::Brick.remove_instance_variable(:@_additional_references_loaded) if ::Brick.instance_variable_defined?(:@_additional_references_loaded)
|
34
|
+
# ::Brick.remove_instance_variable(:@_additional_references_loaded) if ::Brick.instance_variable_defined?(:@_additional_references_loaded)
|
35
35
|
|
36
|
-
# --------------------------------------------
|
37
|
-
# 1. Load three initializers early
|
38
|
-
# (inflectsions.rb, brick.rb, apartment.rb)
|
39
|
-
# Very first thing, load inflections since we'll be using .pluralize and .singularize on table and model names
|
40
|
-
if File.exist?(inflections = ::Rails.root&.join('config/initializers/inflections.rb') || '')
|
41
|
-
load inflections
|
42
|
-
end
|
43
|
-
# Now the Brick initializer since there may be important schema things configured
|
44
|
-
if !::Brick.initializer_loaded && File.exist?(brick_initializer = ::Rails.root&.join('config/initializers/brick.rb') || '')
|
45
|
-
::Brick.initializer_loaded = load brick_initializer
|
46
|
-
|
47
|
-
# After loading the initializer, add compatibility for ActiveStorage and ActionText if those haven't already been
|
48
|
-
# defined. (Further JSON configuration for ActiveStorage metadata happens later in the after_initialize hook.)
|
49
|
-
# begin
|
50
|
-
['ActiveStorage', 'ActionText'].each do |ar_extension|
|
51
|
-
if Object.const_defined?(ar_extension) &&
|
52
|
-
(extension = Object.const_get(ar_extension)).respond_to?(:table_name_prefix) &&
|
53
|
-
!::Brick.config.table_name_prefixes.key?(as_tnp = extension.table_name_prefix)
|
54
|
-
::Brick.config.table_name_prefixes[as_tnp] = ar_extension
|
55
|
-
end
|
56
|
-
end
|
57
|
-
# rescue # NoMethodError
|
58
|
-
# end
|
59
|
-
|
60
|
-
# Support the followability gem: https://github.com/nejdetkadir/followability
|
61
|
-
if Object.const_defined?('Followability') && !::Brick.config.table_name_prefixes.key?('followability_')
|
62
|
-
::Brick.config.table_name_prefixes['followability_'] = 'Followability'
|
63
|
-
end
|
64
|
-
end
|
65
|
-
# Load the initializer for the Apartment gem a little early so that if .excluded_models and
|
66
|
-
# .default_schema are specified then we can work with non-tenanted models more appropriately
|
67
|
-
if (apartment = Object.const_defined?('Apartment')) &&
|
68
|
-
File.exist?(apartment_initializer = ::Rails.root.join('config/initializers/apartment.rb'))
|
69
|
-
require 'apartment/adapters/abstract_adapter'
|
70
|
-
Apartment::Adapters::AbstractAdapter.class_exec do
|
71
|
-
if instance_methods.include?(:process_excluded_models)
|
72
|
-
def process_excluded_models
|
73
|
-
# All other models will share a connection (at Apartment.connection_class) and we can modify at will
|
74
|
-
Apartment.excluded_models.each do |excluded_model|
|
75
|
-
begin
|
76
|
-
process_excluded_model(excluded_model)
|
77
|
-
rescue NameError => e
|
78
|
-
(@bad_models ||= []) << excluded_model
|
79
|
-
end
|
80
|
-
end
|
81
|
-
end
|
82
|
-
end
|
83
|
-
end
|
84
|
-
unless @_apartment_loaded
|
85
|
-
load apartment_initializer
|
86
|
-
@_apartment_loaded = true
|
87
|
-
end
|
88
|
-
end
|
89
36
|
# Only for Postgres (Doesn't work in sqlite3 or MySQL)
|
90
37
|
# puts ActiveRecord::Base.execute_sql("SELECT current_setting('SEARCH_PATH')").to_a.inspect
|
91
38
|
|
@@ -438,7 +385,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
|
|
438
385
|
loop do
|
439
386
|
klass = Object
|
440
387
|
proposed_name_parts.each do |part|
|
441
|
-
if klass.const_defined?(part)
|
388
|
+
if klass.const_defined?(part) && klass.name != part
|
442
389
|
begin
|
443
390
|
klass = klass.const_get(part)
|
444
391
|
rescue NoMethodError => e
|
data/lib/brick/version_number.rb
CHANGED
data/lib/brick.rb
CHANGED
@@ -232,10 +232,6 @@ module Brick
|
|
232
232
|
)
|
233
233
|
)
|
234
234
|
)
|
235
|
-
# unless a.polymorphic? || (!a.belongs_to? && (through = a.options[:through])) ||
|
236
|
-
# (a.klass && ::Brick.config.exclude_tables.exclude?(a.klass.table_name) &&
|
237
|
-
# (!a.belongs_to? || (same_type = (fk_type = model_cols[a.foreign_key.to_s]&.type) == pk_type))
|
238
|
-
# )
|
239
235
|
if same_type == false # We really do want to test specifically for false here, and not nil!
|
240
236
|
puts "WARNING:
|
241
237
|
Foreign key column #{a.klass.table_name}.#{a.foreign_key} is #{fk_type}, but the primary key it relates to, #{primary_klass.table_name}.#{a_pk}, is #{pk_type}.
|
@@ -1564,9 +1560,7 @@ module ActiveRecord
|
|
1564
1560
|
used_cols = {}
|
1565
1561
|
# Find and expand out all column names being used in select(...)
|
1566
1562
|
new_select_values = relation.select_values.map(&:to_s).each_with_object([]) do |col, s|
|
1567
|
-
|
1568
|
-
s << col # Just pass it through
|
1569
|
-
else
|
1563
|
+
unless col.include?(' ') # Pass it through if it's some expression (No chance for a simple column reference)
|
1570
1564
|
col = if (col_parts = col.split('.')).length == 1
|
1571
1565
|
[col]
|
1572
1566
|
else
|
@@ -1574,6 +1568,7 @@ module ActiveRecord
|
|
1574
1568
|
end
|
1575
1569
|
used_cols[col] = nil
|
1576
1570
|
end
|
1571
|
+
s << col
|
1577
1572
|
end
|
1578
1573
|
if new_select_values.present?
|
1579
1574
|
relation.select_values = new_select_values
|
@@ -171,7 +171,7 @@ if ActiveRecord::Base.respond_to?(:brick_select) && !::Brick.initializer_loaded
|
|
171
171
|
|
172
172
|
# # Custom path prefix to apply to all auto-generated Brick routes. Also causes auto-generated controllers
|
173
173
|
# # to be created inside a module with the same name.
|
174
|
-
# ::Brick.path_prefix = '
|
174
|
+
# ::Brick.path_prefix = 'brick'
|
175
175
|
|
176
176
|
# # Normally all are enabled in development mode, and for security reasons only models are enabled in production
|
177
177
|
# # and test. This allows you to either (a) turn off models entirely, or (b) enable controllers, views, and routes
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: brick
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.206
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Lorin Thwaits
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-
|
11
|
+
date: 2024-03-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activerecord
|