brick 1.0.108 → 1.0.109

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e9a085e3f9ba811623d8ebc5d840018348d207b6b1ecab97c066894c44c6ab0
-  data.tar.gz: 83f32dc71791730d7370f3375b3c19e6cc00e8062efe5b01bdb4cf5aa40b92b9
+  metadata.gz: 1621b6af75759b90c788ce080db85608731c2bfc026c82d7bcea011a89c2162e
+  data.tar.gz: a4242388d2fa29a12229c620d91b5d572e9e2f7688783beb6963817cf3fac340
 SHA512:
-  metadata.gz: dda58c12995437cb95ce60224543d64ef2ed16b0792a083e0def39e7be4569ceaaad86098f6470daf45c358db1d10a1ff350195c0c61ccd3363cbcfae0c344c2
-  data.tar.gz: 673a82fbbd268c4c8ba590c8eb980fe6e71a62caff710d32ff3b21b3c67927a22ec02380d5d8f8366a1dcadaece238aab3e737f92e879de9da5893dcde0251fa
+  metadata.gz: fa089c1bc9663e764b783c639ca9ca24c18a5cbbc788281e11620b33277e87282b6e1a0195d12686b72f53a5ae4a5bcb9e8343e9ef9bb4d97f53fb69ad4619fe
+  data.tar.gz: 784eed99a879191dff95b5dfd061f8025d52d3e30eb16b7a754b425c2f4ad58e03e8631949d807f130dc86e55cb3a5e08d215a3f1729b4465c58dc3cecffb96d

data/lib/brick/compatibility.rb

@@ -42,9 +42,36 @@ end
 # file by having the line "require 'brick/compatibility'" to be the last line in that
 # file.
 require 'bigdecimal'
-if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.6') &&
-   ActiveRecord.version < ::Gem::Version.new('5.0')
-  def BigDecimal.new(*args, **kwargs)
-    BigDecimal(*args, **kwargs)
+if ActiveRecord.version < ::Gem::Version.new('5.0')
+  if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.6')
+    def BigDecimal.new(*args, **kwargs)
+      BigDecimal(*args, **kwargs)
+    end
+
+    if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('3.1')
+      # @@schemes fix for global_id gem < 1.0
+      URI.class_variable_set(:@@schemes, {}) unless URI.class_variables.include?(:@@schemes)
+      if Gem::Specification.all_names.find { |g| g.start_with?('puma-') }
+        require 'rack/handler/puma'
+        module Rack::Handler::Puma
+          class << self
+            alias _brick_run run
+            def run(app, *args, **options)
+              options.merge!(args.pop) if args.last.is_a?(Hash)
+              _brick_run(app, **options)
+            end
+          end
+        end
+      end
+
+      require 'json'
+      if JSON::Parser.method(:initialize).parameters.length < 2 && JSON.method(:parse).arity == -2
+        JSON.class_exec do
+          def self.parse(source, opts = {})
+            ::JSON::Parser.new(source, **opts).parse
+          end
+        end
+      end
+    end
   end
 end

data/lib/brick/extensions.rb

@@ -421,7 +421,10 @@ module ActiveRecord
       is_distinct = nil
       wheres = {}
       params.each do |k, v|
-        next if ['_brick_schema', '_brick_order', 'controller', 'action'].include?(k)
+        next if ['_brick_schema', '_brick_order',
+                 '_brick_erd', '_brick_exclude', '_brick_unexclude',
+                 '_brick_page', '_brick_page_size', '_brick_offset', '_brick_limit',
+                 '_brick_is_api', 'controller', 'action'].include?(k)
 
         if (where_col = (ks = k.split('.')).last)[-1] == '!'
           where_col = where_col[0..-2]
@@ -448,7 +451,10 @@ module ActiveRecord
         # %%% Have once gotten this error with MSSQL referring to http://localhost:3000/warehouse/cold_room_temperatures__archive
         #     ActiveRecord::StatementInvalid (TinyTds::Error: DBPROCESS is dead or not enabled)
         #     Relevant info here:  https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues/402
+        is_api = params['_brick_is_api']
         columns.each do |col|
+          next if (col.type.nil? || col.type == :binary) && is_api
+
           col_alias = " AS #{col.name}_" if (col_name = col.name) == 'class'
           selects << if is_mysql
                        "`#{tbl_no_schema}`.`#{col_name}`#{col_alias}"
@@ -1538,9 +1544,13 @@ class Object
             end
             if (current_api_root || is_openapi) &&
                !params&.key?('_brick_schema') &&
-               (referrer_params = request.env['HTTP_REFERER']&.split('?')&.last&.split('&')&.map { |x| x.split('=') }).present?
+               (referrer_params = request.env['HTTP_REFERER']&.split('?')&.last&.split('&')&.each_with_object({}) do |x, s|
+                 if (kv = x.split('=')).length > 1
+                   s[kv.first] = kv[1..-1].join('=')
+                 end
+               end).present?
               if params
-                referrer_params.each { |k, v| params.send(:parameters)[k] = v }
+                referrer_params.each { |k, v| (params.respond_to?(:parameters) ? send(:parameters) : params)[k] = v }
               else
                 api_params = referrer_params&.to_h
               end
@@ -1651,11 +1661,12 @@ class Object
             order_by, _ = model._brick_calculate_ordering(ordering, true) # Don't do the txt part
 
             ar_relation = ActiveRecord.version < Gem::Version.new('4') ? model.preload : model.all
+            params['_brick_is_api'] = true if (is_api = request.format == :js || current_api_root)
             @_brick_params = ar_relation.brick_select(params, (selects ||= []), order_by,
                                                       translations = {},
                                                       join_array = ::Brick::JoinArray.new)
 
-            if request.format == :js || current_api_root # Asking for JSON?
+            if is_api # Asking for JSON?
               # Apply column renaming
               data = ar_relation.respond_to?(:_select!) ? ar_relation.dup._select!(*selects) : ar_relation.select(selects)
               if data.present? &&
@@ -1667,13 +1678,16 @@ class Object
                 end
               end
 
-              # %%% Still need to figure out column filtering and transformations
+              # # %%% This currently only gives a window to check security and raise an exception if someone isn't
+              # # authenticated / authorised. Still need to figure out column filtering and transformations.
               # proc_result = if (column_filter = ::Brick.config.api_column_filter).is_a?(Proc)
-              #                 object_columns = relation.last[:cols]
+              #                 object_columns = (relation = model&._brick_relation)[:cols]
               #                 begin
               #                   num_args = column_filter.arity.negative? ? 5 : column_filter.arity
               #                   # object_name, api_version, columns, data
-              #                   column_filter.call(*[relation.first, api_ver_path, object_columns, nil][0...num_args])
+              #                   api_ver_path = request.path[0..-relation[:resource].length]
+              #                   # Call the api_column_filter in the context of this auto-built controller
+              #                   instance_exec(*[relation[:resource], relation, api_ver_path, object_columns, data][0...num_args], &column_filter)
               #                 rescue StandardError => e
               #                   puts "::Brick.api_column_filter Proc error: #{e.message}"
               #                 end
@@ -1685,7 +1699,6 @@ class Object
               #           else
               #             relation.last[:cols]
               #           end
-              # binding.pry
 
               render inline: { data: data }.to_json, content_type: ['*/*', 'text/html'].include?(request.format) ? 'application/json' : request.format
               return
@@ -1984,7 +1997,6 @@ end.class_exec do
 
     # return if ActiveRecord::Base.connection.current_database == 'postgres'
 
-    initializer_loaded = false
     orig_schema = nil
     if (relations = ::Brick.relations).empty?
       # Very first thing, load inflections since we'll be using .pluralize and .singularize on table and model names
@@ -1993,7 +2005,7 @@ end.class_exec do
       end
       # Now the Brick initializer since there may be important schema things configured
       if File.exist?(brick_initializer = ::Rails.root.join('config/initializers/brick.rb'))
-        initializer_loaded = load brick_initializer
+        ::Brick.initializer_loaded = load brick_initializer
       end
       # Load the initializer for the Apartment gem a little early so that if .excluded_models and
       # .default_schema are specified then we can work with non-tenanted models more appropriately
@@ -2266,7 +2278,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
       end
       v[:class_name] = (schema_names + [singular]).map(&:camelize).join('::')
     end
-    ::Brick.load_additional_references if initializer_loaded
+    ::Brick.load_additional_references if ::Brick.initializer_loaded
 
     if orig_schema && (orig_schema = (orig_schema - ['pg_catalog', 'pg_toast', 'heroku_ext']).first)
       puts "Now switching back to \"#{orig_schema}\" schema."
@@ -2648,8 +2660,10 @@ module Brick
     end
 
     def find_col_renaming(api_ver_path, relation_name)
-      (column_renames = ::Brick.config.api_column_renaming&.fetch(api_ver_path, nil) ||
-                        ::Brick.config.api_column_renaming)&.fetch(relation_name, nil)
+      ::Brick.config.api_column_renaming&.fetch(
+        api_ver_path,
+        ::Brick.config.api_column_renaming&.fetch(relation_name, nil)
+      )
     end
 
     def _class_pk(dotted_name, multitenant)

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -135,7 +135,7 @@ module Brick
       @existing_stis ||= Brick.config.sti_namespace_prefixes.each_with_object({}) { |snp, s| s[snp.first[2..-1]] = snp.last unless snp.first.end_with?('::') }
     end
 
-    attr_accessor :default_schema, :db_schemas, :routes_done, :is_oracle, :is_eager_loading, :auto_models
+    attr_accessor :default_schema, :db_schemas, :routes_done, :is_oracle, :is_eager_loading, :auto_models, :initializer_loaded
 
     def set_db_schema(params = nil)
       # If Apartment::Tenant.current is not still the default (usually 'public') then an elevator has brought us into
@@ -682,9 +682,38 @@ In config/initializers/brick.rb appropriate entries would look something like:
             if (schema_name = v.fetch(:schema, nil))
               schema_prefix = "#{schema_name}."
             end
+
+            # Track routes being built
+            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, "#{schema_prefix&.tr('.', '/')}#{v[:resource]}"]
+            end
+
             options = {}
             options[:only] = [:index, :show] if v.key?(:isView)
-            # First do the API routes if necessary
+
+            # First do the normal routes
+            if path_prefix
+              # Was:  send(:scope, path: path_prefix) do
+              send(:namespace, path_prefix) do
+                brick_routes_create.call(schema_name, v[:resource], options)
+                sti_subclasses.fetch(class_name, nil)&.each do |sc| # Add any STI subclass routes for this relation
+                  brick_routes_create.call(schema_name, sc.underscore.tr('/', '_').pluralize, options)
+                end
+              end
+            else
+              brick_routes_create.call(schema_name, v[:resource], options)
+              sti_subclasses.fetch(class_name, nil)&.each do |sc| # Add any STI subclass routes for this relation
+                brick_routes_create.call(schema_name, sc.underscore.tr('/', '_').pluralize, options)
+              end
+            end
+
+            # Now the API routes if necessary
             full_resource = nil
             ::Brick.api_roots&.each do |api_root|
               api_done_views = (versioned_views[api_root] ||= {})
@@ -742,7 +771,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
                 proc_result = if (filter = ::Brick.config.api_filter).is_a?(Proc)
                                 begin
                                   num_args = filter.arity.negative? ? 6 : filter.arity
-                                  filter.call(*[unversioned, k, actions, api_ver_num, found, test_ver_num][0...num_args])
+                                  filter.call(*[unversioned, k, view_relation, actions, api_ver_num, found, test_ver_num][0...num_args])
                                 rescue StandardError => e
                                   puts "::Brick.api_filter Proc error: #{e.message}"
                                 end
@@ -811,33 +840,6 @@ In config/initializers/brick.rb appropriate entries would look something like:
                 end
               end
             end
-
-            # Track routes being built
-            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, "#{schema_prefix&.tr('.', '/')}#{v[:resource]}"]
-            end
-
-            # Now the normal routes
-            if path_prefix
-              # Was:  send(:scope, path: path_prefix) do
-              send(:namespace, path_prefix) do
-                brick_routes_create.call(schema_name, v[:resource], options)
-                sti_subclasses.fetch(class_name, nil)&.each do |sc| # Add any STI subclass routes for this relation
-                  brick_routes_create.call(schema_name, sc.underscore.tr('/', '_').pluralize, options)
-                end
-              end
-            else
-              brick_routes_create.call(schema_name, v[:resource], options)
-              sti_subclasses.fetch(class_name, nil)&.each do |sc| # Add any STI subclass routes for this relation
-                brick_routes_create.call(schema_name, sc.underscore.tr('/', '_').pluralize, options)
-              end
-            end
           end
 
           if ::Brick.config.add_status && instance_variable_get(:@set).named_routes.names.exclude?(:brick_status)
@@ -857,7 +859,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
             if Object.const_defined?('Rswag::Ui')
               rswag_path = ::Rails.application.routes.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]&.uniq!)&.each do |doc_endpoint|
+              (doc_endpoints = Rswag::Ui.config.config_object[:urls])&.each do |doc_endpoint|
                 puts "Mounting OpenApi 3.0 documentation endpoint for \"#{doc_endpoint[:name]}\" on #{doc_endpoint[:url]}"
                 send(:get, doc_endpoint[:url], { to: 'brick_openapi#index' })
                 endpoint_parts = doc_endpoint[:url]&.split('/')
@@ -1192,8 +1194,13 @@ ActiveSupport.on_load(:active_record) do
     arsc.class_exec do
       def self.create(connection, callable = nil, &block)
         relation = (callable || block).call ::ActiveRecord::StatementCache::Params.new
-        bind_map = ::ActiveRecord::StatementCache::BindMap.new relation.bound_attributes
-        query_builder = connection.cacheable_query(self, relation.arel)
+        bind_map = ::ActiveRecord::StatementCache::BindMap.new(
+                     # AR <= 4.2 uses relation.bind_values
+                     relation.respond_to?(:bound_attributes) ? relation.bound_attributes : relation.bind_values
+                   )
+        options = [self, relation.arel]
+        options.shift if connection.method(:cacheable_query).arity == 1 # Rails <= 5.0
+        query_builder = connection.cacheable_query(*options)
         new query_builder, bind_map
       end
     end
@@ -1237,7 +1244,8 @@ ActiveSupport.on_load(:active_record) do
     end
   end
 
-  if Psych.respond_to?(:unsafe_load) && ActiveRecord.version < ::Gem::Version.new('6.1')
+  if ActiveRecord.version < ::Gem::Version.new('6.1') &&
+     Psych.method(:load).parameters.any? { |param| param.first == :key && param.last == :aliases }
     Psych.class_exec do
       class << self
         alias _original_load load
@@ -1279,7 +1287,9 @@ ActiveSupport.on_load(:active_record) do
       def initialize(base, associations, joins, eager_loading: true)
         araat = ::ActiveRecord::Associations::AliasTracker
         if araat.respond_to?(:create_with_joins) # Rails 5.0 and 5.1
-          @alias_tracker = araat.create_with_joins(base.connection, base.table_name, joins)
+          cwj_options = [base.connection, base.table_name, joins]
+          cwj_options << base.type_caster if araat.method(:create_with_joins).arity > 3 # Rails <= 5.1
+          @alias_tracker = araat.create_with_joins(*cwj_options)
           @eager_loading = eager_loading # (Unused in Rails 5.0)
         else # Rails 4.2
           @alias_tracker = araat.create(base.connection, joins)
@@ -1648,21 +1658,24 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
   end
 
   require 'active_model'
-  require 'active_model/type'
-  require 'active_model/type/value'
-  class ActiveModel::Type::Value
-    def initialize(*args, precision: nil, limit: nil, scale: nil)
-      @precision = precision
-      @scale = scale
-      @limit = limit
+  begin
+    require 'active_model/type'
+    require 'active_model/type/value'
+    class ActiveModel::Type::Value
+      def initialize(*args, precision: nil, limit: nil, scale: nil)
+        @precision = precision
+        @scale = scale
+        @limit = limit
+      end
     end
+  rescue LoadError => e # AR <= 4.2 doesn't have ActiveModel::Type
   end
 
   if Object.const_defined?('I18n')
     module I18n::Base
       alias _brick_translate translate
       def translate(key = nil, *args, throw: false, raise: false, locale: nil, **options)
-        options.merge!(args.pop) if args.length > 0 && args.last.is_a?(Hash)
+        options.merge!(args.pop) if args.last.is_a?(Hash)
         _brick_translate(key = nil, throw: false, raise: false, locale: nil, **options)
       end
     end
@@ -1673,8 +1686,12 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
 
     # Creates the authenticity token for the current request.
     def form_authenticity_token(*args, form_options: {}) # :doc:
-      form_options.merge!(args.pop) if args.length > 0 && args.last.is_a?(Hash)
-      masked_authenticity_token(session, form_options: form_options)
+      if method(:masked_authenticity_token).arity == 1
+        masked_authenticity_token(session) # AR <= 4.2 doesn't use form_options
+      else
+        form_options.merge!(args.pop) if args.last.is_a?(Hash)
+        masked_authenticity_token(session, form_options: form_options)
+      end
     end
   end
 
@@ -1684,7 +1701,7 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
         encrypted = if method(:_encrypt).arity == 1
                       _encrypt(value) # Rails <= 5.1
                     else
-                      if args.length > 0 && args.last.is_a?(Hash)
+                      if args.last.is_a?(Hash)
                         expires_at ||= args.last[:expires_at]
                         expires_in ||= args.last[:expires_in]
                         purpose ||= args.last[:purpose]
@@ -1697,7 +1714,7 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
     if const_defined?('Messages')
       class Messages::Metadata
         def self.wrap(message, *args, expires_at: nil, expires_in: nil, purpose: nil)
-          if args.length > 0 && args.last.is_a?(Hash)
+          if args.last.is_a?(Hash)
             expires_at ||= args.last[:expires_at]
             expires_in ||= args.last[:expires_in]
             purpose ||= args.last[:purpose]

data/lib/generators/brick/install_generator.rb

@@ -139,7 +139,7 @@ module Brick
 # Settings for the Brick gem
 # (By default this auto-creates models, controllers, views, and routes on-the-fly.)
 
-if ActiveRecord::Base.respond_to?(:brick_select)
+if ActiveRecord::Base.respond_to?(:brick_select) && !::Brick.initializer_loaded
   # Mode -- generally :on or :off, or only in :development.  Also available is :diag_env which enables only
   # when the environment variable BRICK is set.
   Brick.mode = :development

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.108
+  version: 1.0.109
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-21 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord