brick 1.0.226 → 1.0.227
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/brick/extensions.rb +7 -3
- data/lib/brick/rails/engine.rb +1 -1
- data/lib/brick/version_number.rb +1 -1
- data/lib/generators/brick/controllers_generator.rb +2 -2
- 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: 1640b4022f78ed3bba288342fd3cb4f3c90cdb75c09aa804b9aeb7e91ae64403
|
4
|
+
data.tar.gz: 1c44e055658540a923db08a4ef0114f1291024acb90c2cad26631c61a9b050a9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 61345c77cea2b0d61f9828086f3c9e9b464d377945b2a1a78822f4db36bd37a73e052689750b23f54549fd17e0cd5af0a794eec664ba3a593c4a5b90fb12be13
|
7
|
+
data.tar.gz: b05f1791d999a9e57ee1987a336dde5aefc1bfda029a8afd0a26103b4b64ea89bde3bad1f954f70fa25ec4d1d60aaf53ad7a363801c4695113b4ddbe6d52bf0b
|
data/lib/brick/extensions.rb
CHANGED
@@ -1497,7 +1497,7 @@ end
|
|
1497
1497
|
# ... then just fall through and allow it to fail when trying to load the ____Controller class normally.
|
1498
1498
|
end
|
1499
1499
|
unless skip_controller
|
1500
|
-
Object.send(:build_controller, self, class_name, plural_class_name, model, relations)
|
1500
|
+
Object.send(:build_controller, self, class_name, plural_class_name, model, relations, is_brick_prefix)
|
1501
1501
|
end
|
1502
1502
|
|
1503
1503
|
# MODULE
|
@@ -2096,7 +2096,7 @@ class Object
|
|
2096
2096
|
end
|
2097
2097
|
end
|
2098
2098
|
|
2099
|
-
def build_controller(namespace, class_name, plural_class_name, model, relations)
|
2099
|
+
def build_controller(namespace, class_name, plural_class_name, model, relations, is_brick_prefix = nil)
|
2100
2100
|
if (is_avo = (namespace.name == 'Avo' && Object.const_defined?('Avo')))
|
2101
2101
|
# Basic Avo functionality is available via its own generic controller.
|
2102
2102
|
# (More information on https://docs.avohq.io/3.0/controllers.html)
|
@@ -2278,7 +2278,11 @@ class Object
|
|
2278
2278
|
end
|
2279
2279
|
|
2280
2280
|
self.protect_from_forgery unless: -> { self.request.format.js? }
|
2281
|
-
|
2281
|
+
pcn_split = [plural_class_name]
|
2282
|
+
namespace_names = namespace&.name&.split('::')
|
2283
|
+
namespace_names&.shift if is_brick_prefix
|
2284
|
+
pcn_split.unshift(namespace_names.join('::')) if namespace_names.present?
|
2285
|
+
tn_start = pcn_split.length > 1 ? -2 : -1
|
2282
2286
|
plural_table_name = pcn_split[tn_start..-1].join.underscore.pluralize
|
2283
2287
|
singular_table_name = plural_table_name.singularize
|
2284
2288
|
unless is_avo
|
data/lib/brick/rails/engine.rb
CHANGED
@@ -681,7 +681,7 @@ window.addEventListener(\"popstate\", linkSchemas);
|
|
681
681
|
rescue StandardError => e
|
682
682
|
# Search through the routes to confirm that something might match (Devise stuff for instance, which has its own view templates),
|
683
683
|
# and bubble the same exception (probably an ActionView::MissingTemplate) if a legitimate option is found.
|
684
|
-
raise if ActionView.version >= ::Gem::Version.new('5.0') &&
|
684
|
+
raise if ActionView.version >= ::Gem::Version.new('5.0') && args[1] &&
|
685
685
|
::Rails.application.routes.set.find { |x| args[1].include?(x.defaults[:controller]) && args[0] == x.defaults[:action] }
|
686
686
|
|
687
687
|
find_template_err = e
|
data/lib/brick/version_number.rb
CHANGED
@@ -63,8 +63,8 @@ module Brick
|
|
63
63
|
else
|
64
64
|
Object
|
65
65
|
end
|
66
|
-
|
67
|
-
|
66
|
+
_built_controller, code = Object.send(:build_controller, namespace, (controller_name = "#{controller_parts.last}Controller"), controller_parts.last, controller_option.model, relations)
|
67
|
+
controller_parts[-1] = controller_name
|
68
68
|
path = ['controllers']
|
69
69
|
path.concat(controller_parts.map(&:underscore))
|
70
70
|
dir = +"#{::Rails.root}/app"
|
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.227
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Lorin Thwaits
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2025-01-
|
11
|
+
date: 2025-01-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activerecord
|