brick 1.0.184 → 1.0.186

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b2c6e3f1da384e5310953f39a9bb08f85bdeabf7d2cf4143e483ad4df9f146
-  data.tar.gz: e3bb0fc597cfb9908a87667b6e785f41dc73337fd834151dd8ce41af8aabca02
+  metadata.gz: e5a41639892f2e1b8c16c55334cd7cb50f9bfd3a5bffd1eb093764deaad606d1
+  data.tar.gz: 4a18ba9341e71fb00bbc6dde1686b561de8cdd9b898905c680ba85f83cabf394
 SHA512:
-  metadata.gz: d1f52d74e8feca2255c86423b4108ddad31daa3b49c4f54ae0c25080542e51e1b1a812238ea6313de51c2644f67ac4ab5ad7c9759fbfb535a07e8c3134010f39
-  data.tar.gz: 9b21a929ef26076909595907bfda0d74b73d274bb6442d58eb80beb4b152b6aaf97ec8a8177dc0057df9188dcfde9e9540f1573c6b59ae6be62b40ac0a7541d8
+  metadata.gz: c30f5f19ca9f5fe716d32d5efc5b0bc3a7d8addeeb9a8798cb34dc23efcc6abb92391854e899269875ccc2319b36b7361068e9ad17ad5d6245b16bf4ac7aaa89
+  data.tar.gz: d66d5544a948ad006294c654f8b7333b67b1a630c718c525a5fe40032414e4d307c0fe0aab70fcec47add3cd1feaed389ae3af75f69e3b480dbd4be3fc50a0a0

data/lib/brick/compatibility.rb

@@ -48,10 +48,14 @@ if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.7')
     end
   end
 
-  unless ActiveRecord.const_defined?(:NoDatabaseError) # Generic version of NoDatabaseError for Rails <= 4.0
+  unless ActiveRecord.const_defined?(:NoDatabaseError)
     require 'active_model'
+    require 'active_record/deprecator' if ActiveRecord.version >= Gem::Version.new('7.1.0')
     require 'active_record/errors'
-    class ::ActiveRecord::NoDatabaseError < ::ActiveRecord::StatementInvalid
+    # Generic version of NoDatabaseError for Rails <= 4.0
+    unless ActiveRecord.const_defined?(:NoDatabaseError)
+      class ::ActiveRecord::NoDatabaseError < ::ActiveRecord::StatementInvalid
+      end
     end
   end
 

data/lib/brick/extensions.rb

@@ -317,10 +317,15 @@ module ActiveRecord
         tbl_parts[-1] = aps
         tbl_parts << last_part
       end
-      tbl_parts.unshift(::Brick.config.path_prefix) if ::Brick.config.path_prefix
+      path_prefix = []
+      if ::Brick.config.path_prefix
+        tbl_parts.unshift(::Brick.config.path_prefix)
+        path_prefix << ::Brick.config.path_prefix
+      end
       index = tbl_parts.map(&:underscore).join(separator)
-      # Rails applies an _index suffix to that route when the resource name is singular
-      index << '_index' if mode != :singular && separator == '_' && index == index.singularize
+      # Rails applies an _index suffix to that route when the resource name isn't something plural
+      index << '_index' if mode != :singular && separator == '_' &&
+                           index == (path_prefix + [name&.underscore&.tr('/', '_') || '_']).join(separator)
       index
     end
 
@@ -2044,9 +2049,10 @@ class Object
             _schema, @_is_show_schema_list = ::Brick.set_db_schema(params || api_params)
 
             if is_openapi
-              api_name = Rswag::Ui.config.config_object[:urls].find do |api_url|
-                api_url[:url] == request.path
-              end&.fetch(:name, 'API documentation')
+              doc_endpoints = (Object.const_defined?('Rswag::Ui') &&
+                               (::Rswag::Ui.config.config_object[:urls])) ||
+                              ::Brick.instance_variable_get(:@swagger_endpoints)
+              api_name = doc_endpoints&.find { |api_url| api_url[:url] == request.path }&.fetch(:name, 'API documentation')
               current_api_ver = current_api_root.split('/').last&.[](1..-1).to_i
               json = { 'openapi': '3.0.1', 'info': { 'title': api_name, 'version': request_ver },
                        'servers': [

data/lib/brick/frameworks/rails/engine.rb

@@ -1966,7 +1966,7 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
               def viable_models
                 return _brick_viable_models if ::RailsAdmin::Config.class_variables.include?(:@@system_models)
 
-                brick_models = ::Brick.relations.map { |_k, v| v[:class_name] }
+                brick_models = ::Brick.relations.each_with_object([]) { |rel, s| s << rel.last[:class_name] unless rel.first.is_a?(Symbol) }
 
                 # The original from RailsAdmin (now aliased as _brick_viable_models) loads all classes
                 # in the whole project. This Brick approach is a little more tame.
@@ -1999,7 +1999,7 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
           end
 
           RailsAdmin.config do |config|
-            ::Brick.relations.select { |_k, v| v.key?(:isView) }.each do |_k, relation|
+            ::Brick.relations.select { |_k, v| v.is_a?(Hash) && v.key?(:isView) }.each do |_k, relation|
               config.model(relation[:class_name]) do # new_model_class
                 list do
                   sort_by (sort_col = relation[:cols].first.first)

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 184
+    TINY = 186
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/brick.rb

@@ -162,6 +162,8 @@ module Brick
                                    h[:db_name] = db_name if db_name
                                  end
                                end
+    rescue ActiveRecord::NoDatabaseError
+      {}
     end
 
     def apartment_multitenant
@@ -208,7 +210,10 @@ module Brick
           puts "Based on inclusion in ::Brick.polymorphics, marking association #{full_assoc_name} as being polymorphic."
           a.options[:polymorphic] = true
         end
-        if !a.polymorphic? && (a.belongs_to? || (through = a.options[:through])) &&
+        if (through = a.options[:through]) && !a.through_reflection
+          puts "WARNING:  In model #{model.name}, unable to utilise:  has_many #{a.name}, through: #{through.inspect}"
+        end
+        if !a.polymorphic? && (a.belongs_to? || (through && a.through_reflection)) &&
            !(a.klass && ::Brick.config.exclude_tables.exclude?(a.klass.table_name) &&
               (!a.belongs_to? ||
                 ((fk_type = a.foreign_key.is_a?(Array) ? a.foreign_key.map { |fk_part| model_cols[fk_part.to_s].type } : model_cols[a.foreign_key.to_s].type) &&
@@ -278,7 +283,7 @@ module Brick
               is_invalid_source = true
             end
             if is_invalid_source
-              puts "WARNING:  HMT relationship :#{a.name} in model #{model.name} has invalid source :#{a.source_reflection_name}."
+              puts "  due to invalid source #{a.source_reflection_name.inspect}."
               next
             end
           else
@@ -321,6 +326,12 @@ module Brick
       true
     end
 
+    # Add a swagger endpoint in the same kind of way that RSwag UI does
+    def swagger_endpoint(url, name)
+      @swagger_endpoints ||= []
+      @swagger_endpoints << { url: url, name: name }
+    end
+
     def is_geography?(val)
       val.length < 31 && (val.length - 6) % 8 == 0 && val[0..5].bytes == [230, 16, 0, 0, 1, 12]
     end
@@ -1130,39 +1141,45 @@ In config/initializers/brick.rb appropriate entries would look something like:
         get("/#{controller_prefix}brick_crosstab/data", to: 'brick_gem#crosstab_data')
       end
 
-      if Object.const_defined?('Rswag::Ui')
-        rswag_path = routeset_to_use.routes.find { |r| r.app.app == Rswag::Ui::Engine }&.instance_variable_get(:@path_formatter)&.instance_variable_get(:@parts)&.join
-        first_endpoint_parts = nil
-        (doc_endpoints = Rswag::Ui.config.config_object[:urls])&.each do |doc_endpoint|
+      if ((rswag_ui_present = Object.const_defined?('Rswag::Ui')) &&
+          (rswag_path = routeset_to_use.routes.find { |r| r.app.app == ::Rswag::Ui::Engine }
+                                              &.instance_variable_get(:@path_formatter)
+                                              &.instance_variable_get(:@parts)&.join) &&
+          (doc_endpoints = ::Rswag::Ui.config.config_object[:urls])) ||
+         (doc_endpoints = ::Brick.instance_variable_get(:@swagger_endpoints))
+        last_endpoint_parts = nil
+        doc_endpoints.each do |doc_endpoint|
           puts "Mounting OpenApi 3.0 documentation endpoint for \"#{doc_endpoint[:name]}\" on #{doc_endpoint[:url]}" unless ::Brick.routes_done
           send(:get, doc_endpoint[:url], { to: 'brick_openapi#index' })
           endpoint_parts = doc_endpoint[:url]&.split('/')
-          first_endpoint_parts ||= endpoint_parts
+          last_endpoint_parts = endpoint_parts
         end
       end
       return if ::Brick.routes_done
 
-      if Object.const_defined?('Rswag::Ui')
-        if doc_endpoints.present?
-          if rswag_path && first_endpoint_parts
-            puts "API documentation now available when navigating to:  /#{first_endpoint_parts&.find(&:present?)}/index.html"
+      if doc_endpoints.present?
+        if rswag_ui_present
+          if rswag_path
+            puts "API documentation now available when navigating to:  /#{last_endpoint_parts&.find(&:present?)}/index.html"
           else
             puts "In order to make documentation available you can put this into your routes.rb:"
-            puts "  mount Rswag::Ui::Engine => '/#{first_endpoint_parts&.find(&:present?) || 'api-docs'}'"
+            puts "  mount Rswag::Ui::Engine => '/#{last_endpoint_parts&.find(&:present?) || 'api-docs'}'"
           end
         else
-          sample_path = rswag_path || '/api-docs'
+          puts 'A couple easy ways to create compelling documentation from this are to use Scalar API, or to add the rswag-ui gem.'
+        end
+      elsif rswag_ui_present
+        sample_path = rswag_path || '/api-docs'
+        puts
+        puts "Brick:  rswag-ui gem detected -- to make OpenAPI 3.0 documentation available from a path such as  '#{sample_path}/v1/swagger.json',"
+        puts '        put code such as this in an initializer:'
+        puts '  Rswag::Ui.configure do |config|'
+        puts "    config.swagger_endpoint '#{sample_path}/v1/swagger.json', 'API V1 Docs'"
+        puts '  end'
+        unless rswag_path
           puts
-          puts "Brick:  rswag-ui gem detected -- to make OpenAPI 3.0 documentation available from a path such as  '#{sample_path}/v1/swagger.json',"
-          puts '        put code such as this in an initializer:'
-          puts '  Rswag::Ui.configure do |config|'
-          puts "    config.swagger_endpoint '#{sample_path}/v1/swagger.json', 'API V1 Docs'"
-          puts '  end'
-          unless rswag_path
-            puts
-            puts '        and put this into your routes.rb:'
-            puts "  mount Rswag::Ui::Engine => '/api-docs'"
-          end
+          puts '        and put this into your routes.rb:'
+          puts "  mount Rswag::Ui::Engine => '/api-docs'"
         end
       end
 
@@ -1916,7 +1933,7 @@ module ActiveRecord
       private
 
         # %%% Pretty much have to flat-out replace this guy (I think anyway)
-        # Good with Rails 5.24 through 7 on this
+        # Good with Rails 5.2.4 through 7.1 on this
         # Ransack gem includes Polyamorous which replaces #build in a different way (which we handle below)
         unless Gem::Specification.all_names.any? { |g| g.start_with?('ransack-') }
           def build(associations, base_klass, root = nil, path = '')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.184
+  version: 1.0.186
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord