brick 1.0.158 → 1.0.160

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 326ec09b1c28cf7c54e54bae9ea6ceed7d7e476a177be0a41af14e04f7cc3d11
-  data.tar.gz: 0507c22a2acf86c58737ecfedeb1a1f5ed6979b5263b28c6d6e77b0e9500ab7c
+  metadata.gz: 735ad34b99ba52ae2575c786fdee6c359c5c53e6d2edf53b19bbb5d1f02869ec
+  data.tar.gz: c603e9adebe13192e4be8724b51d563a6b39f89b15c61fab253debb9fc959a66
 SHA512:
-  metadata.gz: d6803593a5c3e17ef40005c405017ed4e7519024ca172a077ad377c201a7b2e2caf2a8b4bc5a0ef63f091124a44199ffd3b386db7d6b5d51352f2e3327537d81
-  data.tar.gz: 486b0a15422b0d3150b575c8d19c24cc3434e3fd8f35335d2e490e1e69e423995a2032de913def73b4f4df0e2789c6f4af7d61930db5cc144d0a0cb76be3ebdc
+  metadata.gz: 14b5a64e366d218ac78bb3ec26370cddcdb506ee292974321a76331a40d272a33ce49b9cb4911314a7e33835bf44255dda73c04449062e159b499e2e0d88c61f
+  data.tar.gz: cfa821c073296681b4b49e0d58538e076ac50ae1ea65b2df6ea8af1c92477842ee737c3d5950d803ce45f52daf48fca065f28bf6cc6a5e6518c408a64305ada6

data/lib/brick/compatibility.rb

@@ -97,11 +97,13 @@ if Object.const_defined?('ActionPack') && !ActionPack.respond_to?(:version)
     end
   end
 end
-require 'action_view' # Needed for Rails <= 4.0
-if Object.const_defined?('ActionView') && !ActionView.respond_to?(:version)
-  module ActionView
-    def self.version
-      ActionPack.version
+if Bundler.locked_gems&.dependencies.key?('action_view')
+  require 'action_view' # Needed for Rails <= 4.0
+  if Object.const_defined?('ActionView') && !ActionView.respond_to?(:version)
+    module ActionView
+      def self.version
+        ActionPack.version
+      end
     end
   end
 end

data/lib/brick/extensions.rb

@@ -30,14 +30,14 @@
 
 # Drag something like HierModel#name onto the rows and have it automatically add five columns -- where type=zone / where type = section / etc
 
-# Support for Postgres / MySQL enums (add enum to model, use model enums to make a drop-down in the UI)
-
-# Currently quadrupling up routes
-
 # Modal pop-up things for editing large text / date ranges / hierarchies of data
 
 # For recognised self-references, have the show page display all related objects up to the parent (or the start of a circular reference)
 
+# When creating or updating an object through an auto-generated controller, it always goes to an auto-generated view template even if the user has supplied their own index.html.erb (or similar) view template
+
+# Upon creation of a new object, when going to the index page, highlight this new object and scroll it into view (likely to the very bottom of everything, although might be sorted differently)
+
 # ==========================================================
 # Dynamically create model or controller classes when needed
 # ==========================================================
@@ -2199,7 +2199,8 @@ class Object
               render json: { result: ::Brick.unexclude_column(table_name, col) }
             else
               @_lookup_context.instance_variable_set("@#{singular_table_name}".to_sym,
-                                                     model.send(:create, send(params_name_sym)))
+                                                     (created_obj = model.send(:create, send(params_name_sym))))
+              # %%% Surface any errors to the user in a flash message
               @_lookup_context.instance_variable_set(:@_brick_model, model)
               index
               render :index

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

@@ -1667,89 +1667,9 @@ end
      end
 %>
   <br><br>
-<%= form_for(obj.becomes(#{model_name}), options) do |f| %>
-  <table class=\"shadow\">
-  <% has_fields = false
-     # If it's a new record, set any default polymorphic types
-     bts.each do |_k, v|
-       if v[2]
-         @#{obj_name}.send(\"#\{model.brick_foreign_type(v.first)}=\", v[1].first&.first&.name)
-       end
-     end if @#{obj_name}.new_record?
-     rtans = #{model_name}.rich_text_association_names if #{model_name}.respond_to?(:rich_text_association_names)
-     (#{model_name}.column_names + (rtans || [])).each do |k|
-       next if (#{(pk.map(&:to_s) || []).inspect}.include?(k) && !bts.key?(k)) ||
-               ::Brick.config.metadata_columns.include?(k)
-
-       col = #{model_name}.columns_hash[k]
-       if !col && rtans&.include?(k)
-         k = k[10..-1] if k.start_with?('rich_text_')
-         col = (rt_col ||= ActiveRecord::ConnectionAdapters::Column.new(
-                             '', nil, ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: 'varchar', type: :text)
-                           )
-               )
-       end
-       val = @#{obj_name}.attributes[k] %>
-    <tr>
-    <th class=\"show-field\"<%= \" title=\\\"#\{col&.comment}\\\"\".html_safe if col&.respond_to?(:comment) && !col&.comment.blank? %>>
-<%    has_fields = true
-      if (bt = bts[k])
-        # Add a final member in this array with descriptive options to be used in <select> drop-downs
-        bt_name = bt[1].map { |x| x.first.name }.join('/')
-        # %%% Only do this if the user has permissions to edit this bt field
-        if bt[2] # Polymorphic?
-          poly_class_name = orig_poly_name = @#{obj_name}.send(model.brick_foreign_type(bt.first))
-          bt_pair = nil
-          loop do
-            bt_pair = bt[1].find { |pair| pair.first.name == poly_class_name }
-            # Accommodate any valid STI by going up the chain of inheritance
-            break unless bt_pair.nil? && poly_class_name = ::Brick.existing_stis[poly_class_name]
-          end
-          puts \"*** Might be missing an STI class called #\{orig_poly_name\} whose base class should have this:
-***   has_many :#{table_name}, as: :#\{bt.first\}
-*** Can probably auto-configure everything using these lines in an initialiser:
-***   Brick.sti_namespace_prefixes = { '::#\{orig_poly_name\}' => 'SomeParentModel' }
-***   Brick.polymorphics = { '#{table_name}.#\{bt.first\}' => ['SomeParentModel'] }\" if bt_pair.nil?
-          # descrips = @_brick_bt_descrip[bt.first][bt_class]
-          poly_id = @#{obj_name}.send(\"#\{bt.first\}_id\")
-          # bt_class.order(obj_pk = bt_class.primary_key).each { |obj| option_detail << [obj.brick_descrip(nil, obj_pk), obj.send(obj_pk)] }
-        end
-        bt_pair ||= bt[1].first # If there's no polymorphism (or polymorphism status is unknown), just get the first one
-        bt_class = bt_pair&.first
-        if bt.length < 4
-          bt << (option_detail = [[\"(No #\{bt_name\} chosen)\", '^^^brick_NULL^^^']])
-          # %%% Accommodate composite keys for obj.pk at the end here
-          collection, descrip_cols = bt_class&.order(Arel.sql(\"#\{bt_class.table_name}.#\{obj_pk = bt_class.primary_key}\"))&.brick_list
-          collection&.brick_(:each) do |obj|
-            option_detail << [
-              obj.brick_descrip(
-                descrip_cols&.first&.map { |col2| obj.send(col2.last) },
-                obj_pk
-              ), obj.send(obj_pk)
-            ]
-          end
-        end %>
-        BT <%= bt_class&.bt_link(bt.first) || orig_poly_name %>
-    <% else %>
-      <%= #{model_name}.human_attribute_name(k, { default: k }) %>
-    <% end %>
-    </th>
-    <td>
-      <%= f.brick_field(k, html_options = {}, val, col, bt, bt_class, bt_name, bt_pair) %>
-    </td>
-    </tr>
-  <% end
-  if has_fields %>
-    <tr><td colspan=\"2\"><%= f.submit({ class: 'update' }) %></td></tr>
-  <% else %>
-    <tr><td colspan=\"2\">(No displayable fields)</td></tr>
-  <% end %>
-  </table>#{
-  "<%= begin
-         ::Brick::Rails.display_binary(obj&.blob&.download, 500_000)&.html_safe
-       rescue
-       end %>" if model_name == 'ActiveStorage::Attachment'}
-<%  end %>
+
+<%= # Write out the mega-form
+    brick_form_for(obj, options, #{model_name}, bts, #{pk.inspect}) %>
 
 #{unless args.first == 'new'
   # Was:  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: 'Delete #\{model_name} -- Are you sure?' }" : "form: { data: { turbo_confirm: 'Delete #\{model_name} -- Are you sure?' } }"

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

@@ -67,9 +67,14 @@ module Brick::Rails::FormBuilder
       when :boolean
         out << self.check_box(method.to_sym)
       when :integer, :decimal, :float
-        digit_pattern = col_type == :integer ? '\d*' : '\d*(?:\.\d*|)'
-        # Used to do this for float / decimal:  self.number_field method.to_sym
-        out << self.text_field(method.to_sym, { pattern: digit_pattern, class: 'check-validity' })
+        if model.respond_to?(:attribute_types) && (enum_type = model.attribute_types[method]).is_a?(ActiveRecord::Enum::EnumType)
+          opts = enum_type.send(:mapping)&.each_with_object([]) { |v, s| s << [v.first, v.first] } || []
+          out << self.select(method.to_sym, [["(No #{method} chosen)", '^^^brick_NULL^^^']] + opts, { value: val || '^^^brick_NULL^^^' }, options)
+        else
+          digit_pattern = col_type == :integer ? '\d*' : '\d*(?:\.\d*|)'
+          # Used to do this for float / decimal:  self.number_field method.to_sym
+          out << self.text_field(method.to_sym, { pattern: digit_pattern, class: 'check-validity' })
+        end
       when *DT_PICKERS.keys
         template.instance_variable_set(:@_date_fields_present, true)
         out << self.text_field(method.to_sym, { class: DT_PICKERS[col_type] })

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

@@ -203,6 +203,100 @@ module Brick::Rails::FormTags
     out.html_safe
   end # brick_grid
 
+  # Our mega show/new/update form
+  def brick_form_for(obj, options = {}, model = obj.class, bts = {}, pk = (obj.class.primary_key || []))
+    pk = [pk] unless pk.is_a?(Array)
+    pk.map!(&:to_s)
+    form_for(obj.becomes(model), options) do |f|
+      out = +'<table class="shadow">'
+      has_fields = false
+      # If it's a new record, set any default polymorphic types
+      bts&.each do |_k, v|
+        if v[2]
+          obj.send("#{model.brick_foreign_type(v.first)}=", v[1].first&.first&.name)
+        end
+      end if obj.new_record?
+      rtans = model.rich_text_association_names if model.respond_to?(:rich_text_association_names)
+      (model.column_names + (rtans || [])).each do |k|
+        next if (pk.include?(k) && !bts.key?(k)) ||
+                ::Brick.config.metadata_columns.include?(k)
+
+        col = model.columns_hash[k]
+        if !col && rtans&.include?(k)
+          k = k[10..-1] if k.start_with?('rich_text_')
+          col = (rt_col ||= ActiveRecord::ConnectionAdapters::Column.new(
+                              '', nil, ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: 'varchar', type: :text)
+                            )
+                )
+        end
+        val = obj.attributes[k]
+        out << "
+    <tr>
+    <th class=\"show-field\"#{" title=\"#{col&.comment}\"".html_safe if col&.respond_to?(:comment) && !col&.comment.blank?}>"
+        has_fields = true
+        if (bt = bts[k])
+          # Add a final member in this array with descriptive options to be used in <select> drop-downs
+          bt_name = bt[1].map { |x| x.first.name }.join('/')
+          # %%% Only do this if the user has permissions to edit this bt field
+          if bt[2] # Polymorphic?
+            poly_class_name = orig_poly_name = obj.send(model.brick_foreign_type(bt.first))
+            bt_pair = nil
+            loop do
+              bt_pair = bt[1].find { |pair| pair.first.name == poly_class_name }
+              # Accommodate any valid STI by going up the chain of inheritance
+              break unless bt_pair.nil? && poly_class_name = ::Brick.existing_stis[poly_class_name]
+            end
+            puts "*** Might be missing an STI class called #{orig_poly_name} whose base class should have this:
+***   has_many :#{table_name}, as: :#{bt.first}
+*** Can probably auto-configure everything using these lines in an initialiser:
+***   Brick.sti_namespace_prefixes = { '::#{orig_poly_name}' => 'SomeParentModel' }
+***   Brick.polymorphics = { '#{table_name}.#{bt.first}' => ['SomeParentModel'] }" if bt_pair.nil?
+            # descrips = @_brick_bt_descrip[bt.first][bt_class]
+            poly_id = obj.send("#{bt.first}_id")
+            # bt_class.order(obj_pk = bt_class.primary_key).each { |obj| option_detail << [obj.brick_descrip(nil, obj_pk), obj.send(obj_pk)] }
+          end
+          bt_pair ||= bt[1].first # If there's no polymorphism (or polymorphism status is unknown), just get the first one
+          bt_class = bt_pair&.first
+          if bt.length < 4
+            bt << (option_detail = [["(No #{bt_name} chosen)", '^^^brick_NULL^^^']])
+            # %%% Accommodate composite keys for obj.pk at the end here
+            collection, descrip_cols = bt_class&.order(Arel.sql("#{bt_class.table_name}.#{obj_pk = bt_class.primary_key}"))&.brick_list
+            collection&.brick_(:each) do |obj|
+              option_detail << [
+                obj.brick_descrip(
+                  descrip_cols&.first&.map { |col2| obj.send(col2.last) },
+                  obj_pk
+                ), obj.send(obj_pk)
+              ]
+            end
+          end
+          out << "BT #{bt_class&.bt_link(bt.first) || orig_poly_name}"
+        else
+          out << model.human_attribute_name(k, { default: k })
+        end
+        out << "
+    </th>
+    <td>
+      #{f.brick_field(k, html_options = {}, val, col, bt, bt_class, bt_name, bt_pair)}
+    </td>
+  </tr>"
+      end
+      if has_fields
+        out << "<tr><td colspan=\"2\">#{f.submit({ class: 'update' })}</td></tr>"
+      else
+        out << '<tr><td colspan="2">(No displayable fields)</td></tr>'
+      end
+      out << '</table>'
+      if model.name == 'ActiveStorage::Attachment'
+        begin
+          out << ::Brick::Rails.display_binary(obj&.blob&.download, 500_000)&.html_safe
+        rescue
+        end
+      end
+      out.html_safe
+    end
+  end # brick_form_for
+
   def link_to_brick(*args, **kwargs)
     return unless ::Brick.config.mode == :on
 

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -1112,20 +1112,22 @@ require 'active_record/relation'
 require 'active_record/relation/query_methods' if ActiveRecord.version < ::Gem::Version.new('5')
 require 'rails/railtie' if ActiveRecord.version < ::Gem::Version.new('4.2')
 
-# Rake tasks
-class Railtie < ::Rails::Railtie
-  Dir.glob("#{File.expand_path(__dir__)}/brick/tasks/**/*.rake").each { |task| load task }
-end
+if Object.const_defined?('Rails')
+  # Rake tasks
+  class Railtie < ::Rails::Railtie
+    Dir.glob("#{File.expand_path(__dir__)}/brick/tasks/**/*.rake").each { |task| load task }
+  end
 
-# Rails < 4.2 does not have env
-module ::Rails
-  unless respond_to?(:env)
-    def self.env
-      @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development")
-    end
+  # Rails < 4.2 does not have env
+  module ::Rails
+    unless respond_to?(:env)
+      def self.env
+        @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development")
+      end
 
-    def self.env=(environment)
-      @_env = ActiveSupport::StringInquirer.new(environment)
+      def self.env=(environment)
+        @_env = ActiveSupport::StringInquirer.new(environment)
+      end
     end
   end
 end

data/lib/generators/brick/migration_builder.rb

@@ -1,5 +1,7 @@
 module Brick
   module MigrationBuilder
+    include FancyGets
+
     # Many SQL types are the same as their migration data type name:
     #   text, integer, bigint, date, boolean, decimal, float
     # These however are not:

data/lib/generators/brick/migrations_generator.rb

@@ -8,7 +8,6 @@ require 'generators/brick/migration_builder'
 module Brick
   # Auto-generates migration files
   class MigrationsGenerator < ::Rails::Generators::Base
-    include FancyGets
     include ::Brick::MigrationBuilder
 
     desc 'Auto-generates migration files for an existing database.'

metadata

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