brick 1.0.178 → 1.0.180

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 888b7144102e5155a28f931b7b986a68a3eb781dee890990fae9f81ed8bf2e21
-  data.tar.gz: c5fcc9dd02f6b45025d600e9a02a16011e93559568c63c24b4acde0f603a2540
+  metadata.gz: c5cc0c73d63cbebcbad81388f8ae444c72dafa57a38c1f2a95b3b7f5bd4a621a
+  data.tar.gz: 8670884c20ac46ee01d28c97fabe97694a2f3862761228e16c0422790a937cc8
 SHA512:
-  metadata.gz: f8f32f40106be993ee33bac87ef4dad4558e7bcbae61f6f61658671b825eba6312586f75fdc329c22a3a2898a2d38e568c70e05ca173e9824637226ce28aaee3
-  data.tar.gz: e3e0fa0646201059751ecf8fdd30860d582aa3e746ceeb3c6cac276aa831dcefe6a9fc8de34f6e4a720fcd5503842192e8cd8f33ceed37cb6087000d342223ee
+  metadata.gz: 62d010ea2765fe14369e18db8b123426f5ace62025b053b453656870223073b75f95add727e5cb2073f78d0f58a88cb293904bcbee08726b0ba09947c16f3709
+  data.tar.gz: 25dbb2878198256df74cc36934bb7fcaab24a3dfd0b9cac55de8d04e2fcfce8ff0158458cd2d76004e354020addd6b38de5001ab79bebecb9f8afaa1f3e5133f

data/lib/brick/extensions.rb

@@ -1189,7 +1189,7 @@ if Object.const_defined?('ActionView')
         # not let Brick have any fun.  So just call this right before any wildcard routes, and
         # you'll be in business!
         def mount_brick_routes
-          add_brick_routes unless ::Brick.routes_done
+          add_brick_routes if !::Brick.routes_done && respond_to?(:add_brick_routes)
         end
       end
     end
@@ -1911,6 +1911,16 @@ class Object
             instance_variable_set(:@resources, ::Brick.get_status_of_resources)
             add_csp_hash
           end
+          self.define_method :schema_create do
+            if (base_class = (model = params['modelName']&.constantize).base_class) &&
+               base_class.column_names.exclude?(col_name = params['colName'])
+              ActiveRecord::Base.connection.add_column(base_class.table_name.to_sym, col_name, (col_type = params['colType']).to_sym)
+              base_class.reset_column_information
+              ::Brick.relations[base_class.table_name]&.fetch(:cols, nil)&.[]=(col_name, [col_type, nil, false, false])
+              # instance_variable_set(:@schema, ::Brick.find_schema(::Brick.set_db_schema(params).first))
+              add_csp_hash
+            end
+          end
           self.define_method :orphans do
             instance_variable_set(:@orphans, ::Brick.find_orphans(::Brick.set_db_schema(params).first))
             add_csp_hash
@@ -2581,7 +2591,7 @@ end.class_exec do
         if arca::AbstractAdapter.private_instance_methods.include?(:with_raw_connection)
           db_statements.define_method(:begin_db_transaction) do
             log("begin immediate transaction", "TRANSACTION") do
-              with_raw_connection(allow_retry: true, uses_transaction: false) do |conn|
+              with_raw_connection(allow_retry: true, materialize_transactions: false) do |conn|
                 conn.transaction(:immediate)
               end
             end

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

@@ -793,7 +793,7 @@ window.addEventListener(\"popstate\", linkSchemas);
                               end.html_safe
               table_options << "<option value=\"#{prefix}brick_status\">(Status)</option>".html_safe if ::Brick.config.add_status
               table_options << "<option value=\"#{prefix}brick_orphans\">(Orphans)</option>".html_safe if is_orphans
-              table_options << "<option value=\"#{prefix}brick_orphans\">(Crosstab)</option>".html_safe if is_crosstab
+              table_options << "<option value=\"#{prefix}brick_crosstab\">(Crosstab)</option>".html_safe if is_crosstab
               css = +"<style>
 #titleSticky {
   position: sticky;
@@ -1063,6 +1063,8 @@ document.querySelectorAll(\"input[type=submit][data-confirm]\").forEach(function
 }
 function doFetch(method, payload, success) {
   payload.authenticity_token = <%= session[:_csrf_token].inspect.html_safe %>;
+  var action = payload._brick_action || location.href;
+  delete payload._brick_action;
   if (!success) {
     success = function (p) {p.text().then(function (response) {
       var result = JSON.parse(response).result;
@@ -1071,7 +1073,7 @@ function doFetch(method, payload, success) {
   }
   var options = {method: method, headers: {\"Content-Type\": \"application/json\"}};
   if (payload) options.body = JSON.stringify(payload);
-  return fetch(location.href, options).then(success);
+  return fetch(action, options).then(success);
 }
 
 // Cause descriptive text to use the same font as the resource 
@@ -1088,7 +1090,8 @@ if (window.brickFontFamily) {
    end %>"
 
               erd_markup = if @_brick_model
-                             "<div id=\"mermaidErd\" class=\"mermaid\">
+                             "<div id=\"mermaidErd\">
+  <div id=\"mermaidDiagram\" class=\"mermaid\">
 erDiagram
 <% def sidelinks(shown_classes, klass)
      links = []
@@ -1168,6 +1171,40 @@ erDiagram
  # callback < %= cb_k % > erdClick
  @_brick_monetized_attributes = model.respond_to?(:monetized_attributes) ? model.monetized_attributes.values : {}
  %>
+  </div>#{
+ add_column = nil
+ # Make into a server control with a javascript snippet
+ # Have post back go to a common "brick_schema" endpoint, this one for add_column
+"
+  <table style=\"position: relative; z-index: 2; border: 2px solid blue;\"><tr>
+    <td rowspan=\"2\">Add<br>Column</td>
+    <td style=\"padding-bottom: 0px\">Type</td><td style=\"padding-bottom: 0px\">Name</td>
+    <td rowspan=\"2\"><input type=\"button\" id=\"btnAddCol\" value=\"+\"></td>
+  </tr><tr><td style=\"padding-top: 0px\">
+    <select id=\"ddlColType\">
+   <option value=\"string\">String</option>
+   <option value=\"text\">Text</option>
+   <option value=\"integer\">Integer</option>
+   <option value=\"bool\">Boolean</option>
+ </select></td>
+ <td style=\"padding-top: 0px\"><input id=\"txtColName\"></td>
+ </tr></table>
+ <script>
+ var btnAddCol = document.getElementById(\"btnAddCol\");
+ btnAddCol.addEventListener(\"click\", function () {
+   var txtColName = document.getElementById(\"txtColName\");
+   var ddlColType = document.getElementById(\"ddlColType\");
+   doFetch(\"POST\", {modelName: \"#{@_brick_model.name}\",
+                      colName: txtColName.value, colType: ddlColType.value,
+                      _brick_action: \"/#{prefix}brick_schema\"},
+     function () { // If it returns successfully, do a page refresh
+       location.href = location.href;
+     }
+   );
+ });
+ </script>
+" unless add_column == false}
+
 </div>
 "
                            end
@@ -1766,7 +1803,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
             gErd.addEventListener(\"click\",
               function (evt) {
                 location.href = changeout(changeout(
-                  changeout(location.href, '_brick_order', null), // Remove any ordering
+                  changeout(location.href, \"_brick_order\", null), // Remove any ordering
                 -1, cbs[this.id].replace(/^[\/]+/, \"\")), \"_brick_erd\", \"1\");
               }
             );
@@ -1774,6 +1811,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
         }}
       });
       mermaid.contentLoaded();
+      window.history.replaceState({}, \"\", changeout(location.href, \"_brick_erd\", \"1\"));
       // Add <span> at the end
       var span = document.createElement(\"SPAN\");
       span.className = \"exclude\";
@@ -1782,7 +1820,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
         e.stopPropagation();
         imgErd.style.display = \"table-cell\";
         mermaidErd.style.display = \"none\";
-        window.history.pushState({}, '', changeout(location.href, '_brick_erd', null));
+        window.history.replaceState({}, \"\", changeout(location.href, \"_brick_erd\", null));
       });
       mermaidErd.appendChild(span);
     }

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -910,7 +910,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
 
         object_name = k.split('.').last # Take off any first schema part
 
-        full_schema_prefix = if (aps = v.fetch(:auto_prefixed_schema, nil))
+        full_schema_prefix = if (full_aps = aps = v.fetch(:auto_prefixed_schema, nil))
                                 aps = aps[0..-2] if aps[-1] == '_'
                                 (schema_prefix&.dup || +'') << "#{aps}."
                               else
@@ -925,7 +925,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
           else
             table_class_length = class_name.length if class_name.length > table_class_length
             tables
-          end << [class_name, aps, k.tr('.', '/')]
+          end << [class_name, aps, k.tr('.', '/')[full_aps&.length || 0 .. -1]]
         end
 
         options = {}
@@ -1089,6 +1089,15 @@ In config/initializers/brick.rb appropriate entries would look something like:
           get("/#{controller_prefix}brick_status", to: 'brick_gem#status', as: status_as.to_s)
         end
 
+        # ::Brick.config.add_schema &&
+        if (schema_as = "#{controller_prefix.tr('/', '_')}brick_schema".to_sym)
+          (
+            !(schema_route = instance_variable_get(:@set).named_routes.find { |route| route.first == schema_as }&.last) ||
+            !schema_route.ast.to_s.include?("/#{controller_prefix}brick_schema/")
+          )
+          post("/#{controller_prefix}brick_schema", to: 'brick_gem#schema_create', as: schema_as.to_s)
+        end
+
         if ::Brick.config.add_orphans && (orphans_as = "#{controller_prefix.tr('/', '_')}brick_orphans".to_sym)
           (
             !(orphans_route = instance_variable_get(:@set).named_routes.find { |route| route.first == orphans_as }&.last) ||

data/lib/generators/brick/install_generator.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'brick'
 require 'rails/generators'
 # require 'rails/generators/active_record'
 

data/lib/generators/brick/migrations_generator.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'brick'
 require 'rails/generators'
 require 'rails/generators/active_record'
 require 'fancy_gets'

data/lib/generators/brick/models_generator.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'brick'
 require 'rails/generators'
 require 'rails/generators/active_record'
 require 'fancy_gets'

data/lib/generators/brick/seeds_generator.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'brick'
 require 'rails/generators'
 require 'fancy_gets'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.178
+  version: 1.0.180
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
+date: 2023-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -164,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.42.0
-- !ruby/object:Gem::Dependency
-  name: rswag-ui
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement