brick 1.0.73 → 1.0.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31f69b5035fcebf947e729c3ebabdf3a686c364fb9ddc6a764a2b34740fdb7c9
-  data.tar.gz: 87009aad044a5a110146d26dc02f62451b18e7ad67b2b07d420edff0718a18c6
+  metadata.gz: a7f077a36e2fd62546cdebfde2b9651807ceeaad9571008460423d9e994df44d
+  data.tar.gz: 368ca31e726fa377325b7ff7838e38cd6b79aa222bcec73cdd6cebc645908d28
 SHA512:
-  metadata.gz: 300fe830280b2ad9d265fa62166aac01ba3e511090f95efa412d1b9ed42fbd72b9f17f8fe51ac1bb358be42f012b46cffbb3c142f6fd3b11f2a442025824e8ec
-  data.tar.gz: abbd021f67adb2c03aae76340ba1cb1f38d0be5b5774d11c5a01a1315e02b80c293c9008021915315416da28937b40af59d821e41ad6ac0eed890be162865d98
+  metadata.gz: a4154837ca3926cb1cd8d4803d62a789f1aa6449625560c63c06708508543e218765288d13a763aab238ea946dfdc33391454793b02805a8cdf46f729cf436da
+  data.tar.gz: 599cd989ef47a99cb0b6b4cb1a1c53da892d5758ccd208ecb4bf1383a2f29c1bc4600458c4de357e5496f90f664984c10634f469a40f80bcc89a9e5592735899

data/lib/brick/extensions.rb

@@ -1141,16 +1141,18 @@ class Object
 
         self.protect_from_forgery unless: -> { self.request.format.js? }
         self.define_method :index do
-          if is_swagger
-            if !params&.key?('_brick_schema') &&
-              (referrer_params = request.env['HTTP_REFERER']&.split('?')&.last&.split('&')&.map { |x| x.split('=') }).present?
-              if params
-                referrer_params.each { |k, v| params.send(:parameters)[k] = v }
-              else
-                api_params = referrer_params&.to_h
-              end
+          if (is_swagger || request.env['REQUEST_PATH'].start_with?(::Brick.api_root)) &&
+             !params&.key?('_brick_schema') &&
+             (referrer_params = request.env['HTTP_REFERER']&.split('?')&.last&.split('&')&.map { |x| x.split('=') }).present?
+            if params
+              referrer_params.each { |k, v| params.send(:parameters)[k] = v }
+            else
+              api_params = referrer_params&.to_h
             end
-            ::Brick.set_db_schema(params || api_params)
+          end
+          ::Brick.set_db_schema(params || api_params)
+
+          if is_swagger
             json = { 'openapi': '3.0.1', 'info': { 'title': Rswag::Ui.config.config_object[:urls].last&.fetch(:name, 'API documentation'), 'version': ::Brick.config.api_version },
                      'servers': [
                        { 'url': '{scheme}://{defaultHost}', 'variables': {
@@ -1701,48 +1703,18 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
       end
     end
 
-    tables = []
-    views = []
-    table_class_length = 0
-    view_class_length = 0
     relations.each do |k, v|
-      name_parts = k.split('.')
-      idx = 1
-      name_parts = name_parts.map do |x|
-        (idx += 1) <= name_parts.length ? x : x.singularize
-      end
-      name_parts.shift if apartment && name_parts.length > 1 && name_parts.first == Apartment.default_schema
-      class_name = name_parts.map(&:camelize).join('::')
-      if v.key?(:isView)
-        view_class_length = class_name.length if class_name.length > view_class_length
-        views
-      else
-        table_class_length = class_name.length if class_name.length > table_class_length
-        tables
-      end << [class_name, name_parts]
-    end
-    puts "\n" if tables.present? || views.present?
-    if tables.present?
-      puts "Classes that can be built from tables:"
-      display_classes(tables, table_class_length)
+      rel_name = k.split('.').map { |rel_part| ::Brick.namify(rel_part, :underscore) }
+      schema_names = rel_name[0..-2]
+      schema_names.shift if ::Brick.apartment_multitenant && schema_names.first == Apartment.default_schema
+      v[:schema] = schema_names.join('.') unless schema_names.empty?
+      # %%% If more than one schema has the same table name, will need to add a schema name prefix to have uniqueness
+      v[:resource] = rel_name.last
+      v[:class_name] = (schema_names + [rel_name.last.singularize]).map(&:camelize).join('::')
     end
-    if views.present?
-      puts "Classes that can be built from views:"
-      display_classes(views, view_class_length)
-    end
-
     ::Brick.load_additional_references if initializer_loaded
   end
 
-  def display_classes(rels, max_length)
-    rels.sort.each do |rel|
-      rel_link = rel.last.dup.map(&:underscore)
-      rel_link[-1] = rel_link[-1]
-      puts "#{rel.first}#{' ' * (max_length - rel.first.length)}  /#{rel_link.join('/')}"
-    end
-    puts "\n"
-  end
-
   def retrieve_schema_and_tables(sql = nil, is_postgres = nil, is_mssql = nil, schema = nil)
     is_mssql = ActiveRecord::Base.connection.adapter_name == 'SQLServer' if is_mssql.nil?
     sql ||= "SELECT t.table_schema AS \"schema\", t.table_name AS relation_name, t.table_type,#{"

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

@@ -726,7 +726,7 @@ erDiagram
   <td><h1>#{model_name}</h1></td>
   <td id=\"imgErd\" title=\"Show ERD\"></td>
 </tr></table>#{template_link}<%
-   if (description = (relation = Brick.relations[#{model_name}.table_name])&.fetch(:description, nil)) %><%=
+   if (description = (relation = Brick.relations[#{model_name}.table_name])&.fetch(:description, nil)).present? %><%=
      description %><br><%
    end
    # FILTER PARAMETERS

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -494,6 +494,13 @@ In config/initializers/brick.rb appropriate entries would look something like:
     def version
       VERSION::STRING
     end
+
+    def display_classes(rels, max_length)
+      rels.sort.each do |rel|
+        puts "#{rel.first}#{' ' * (max_length - rel.first.length)}  /#{rel.last}"
+      end
+      puts "\n"
+    end
   end
 
   module RouteSet
@@ -501,35 +508,59 @@ In config/initializers/brick.rb appropriate entries would look something like:
       return super if ::Brick.routes_done
 
       ::Brick.routes_done = true
+      tables = []
+      views = []
+      table_class_length = 38 # Length of "Classes that can be built from tables:"
+      view_class_length = 37 # Length of "Classes that can be built from views:"
       existing_controllers = routes.each_with_object({}) { |r, s| c = r.defaults[:controller]; s[c] = nil if c }
       ::Rails.application.routes.append do
         # %%% TODO: If no auto-controllers then enumerate the controllers folder in order to build matching routes
         # If auto-controllers and auto-models are both enabled then this makes sense:
-        ::Brick.relations.each do |rel_name, v|
-          rel_name = rel_name.split('.').map { |rel_part| ::Brick.namify(rel_part, :underscore) }
-          schema_names = rel_name[0..-2]
-          schema_names.shift if ::Brick.apartment_multitenant && schema_names.first == Apartment.default_schema
-          # %%% If more than one schema has the same table name, will need to add a schema name prefix to have uniqueness
-          k = rel_name.last
-          unless existing_controllers.key?(controller_name = k.pluralize)
+        ::Brick.relations.each do |k, v|
+          unless !(controller_name = v.fetch(:resource, nil)&.pluralize) || existing_controllers.key?(controller_name)
             options = {}
             options[:only] = [:index, :show] if v.key?(:isView)
-            if schema_names.present? # && !Object.const_defined('Apartment')
-              send(:namespace, schema_names.first) do
-                send(:resources, k.to_sym, **options)
+            full_resource = nil
+            if (schema_name = v.fetch(:schema, nil)) # && !Object.const_defined('Apartment')
+              send(:namespace, schema_name) do
+                send(:resources, v[:resource].to_sym, **options)
               end
-              send(:get, "/api/v1/#{schema_names.first}/#{k}", { to: "#{schema_names.first}/#{controller_name}#index" }) if Object.const_defined?('Rswag::Ui')
+              full_resource = "#{schema_name}/#{v[:resource]}"
+              send(:get, "#{::Brick.api_root}#{full_resource}", { to: "#{schema_name}/#{controller_name}#index" }) if Object.const_defined?('Rswag::Ui')
             else
-              send(:resources, k.to_sym, **options)
-              send(:get, "/api/v1/#{k}", { to: "#{controller_name}#index" }) if Object.const_defined?('Rswag::Ui')
+              send(:resources, v[:resource].to_sym, **options)
+              # Normally goes to something like:  /api/v1/employees
+              send(:get, "#{::Brick.api_root}#{v[:resource]}", { to: "#{controller_name}#index" }) if Object.const_defined?('Rswag::Ui')
+            end
+
+            if (class_name = v.fetch(:class_name, nil))
+              if v.key?(:isView)
+                view_class_length = class_name.length if class_name.length > view_class_length
+                views
+              else
+                table_class_length = class_name.length if class_name.length > table_class_length
+                tables
+              end << [class_name, full_resource || v[:resource]]
             end
           end
-          if ::Brick.config.add_status && instance_variable_get(:@set).named_routes.names.exclude?(:brick_status)
-            get('/brick_status', to: 'brick_gem#status', as: 'brick_status')
-          end
-          if ::Brick.config.add_orphans && instance_variable_get(:@set).named_routes.names.exclude?(:brick_orphans)
-            get('/brick_orphans', to: 'brick_gem#orphans', as: 'brick_orphans')
-          end
+        end
+        puts "\n" if tables.present? || views.present?
+        if tables.present?
+          puts "Classes that can be built from tables:#{' ' * (table_class_length - 38)}  Path:"
+          puts "======================================#{' ' * (table_class_length - 38)}  ====="
+          ::Brick.display_classes(tables, table_class_length)
+        end
+        if views.present?
+          puts "Classes that can be built from views:#{' ' * (view_class_length - 37)}  Path:"
+          puts "=====================================#{' ' * (view_class_length - 37)}  ====="
+          ::Brick.display_classes(views, view_class_length)
+        end
+
+        if ::Brick.config.add_status && instance_variable_get(:@set).named_routes.names.exclude?(:brick_status)
+          get('/brick_status', to: 'brick_gem#status', as: 'brick_status')
+        end
+        if ::Brick.config.add_orphans && instance_variable_get(:@set).named_routes.names.exclude?(:brick_orphans)
+          get('/brick_orphans', to: 'brick_gem#orphans', as: 'brick_orphans')
         end
         if Object.const_defined?('Rswag::Ui') && doc_endpoint = Rswag::Ui.config.config_object[:urls].last
           # Serves JSON swagger info from a path such as  '/api-docs/v1/swagger.json'

data/lib/generators/brick/install_generator.rb

@@ -147,7 +147,7 @@ module Brick
 # Brick.enable_controllers = true # Setting this to \"false\" will disable controllers in development
 # Brick.enable_views = true # Setting this to \"false\" will disable views in development
 
-# Brick.api_root = '/api/v1/' # Path from which to serve out API resources when the RSwag gem is present
+# ::Brick.api_root = '/api/v1/' # Path from which to serve out API resources when the RSwag gem is present
 
 # # By default models are auto-created for database views, and set to be read-only.  This can be skipped.
 # Brick.skip_database_views = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.73
+  version: 1.0.74
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord