brick 1.0.177 → 1.0.179

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 236474c3b0979bffb66ab3561a8fe008ee912ce358dc13556afc2e6e7564fe9a
-  data.tar.gz: d288645dce34156548bd393352591ae1d8eb83a4d1797fa9a2d4150d6e40506d
+  metadata.gz: 54b14ce2c9b998599c3fd529f0a718a85365c49f7405a97e698155e2b9cf22be
+  data.tar.gz: e1337a86afb957dc8a5545090dc667534bbf792266e82f4654a55611b92b7e18
 SHA512:
-  metadata.gz: a8c336750619205c99a76a97414a1315261b0f1498981f3ec7573e73aa759be935357ce7844eb51de4fb905744b3ebe47890fc63005e38fa5f11ce3b009f02c1
-  data.tar.gz: b05c551dc2b483cabdd4b7788c1dc2c8e211803f4d9d1632c69cbe44b2bcf2933f1f39ac4217507fbefe42e0fa680315b3fdcf17b6129108d7811108e7f6f893
+  metadata.gz: c0bee060354c43c662e41e247957f896d7680af9b11cd4109e4ad32ef4b5b8bf907f64d2ed66d32bb59522addb540d1dc3a9e4812f2fdfc1dd6eb6a4da6e516a
+  data.tar.gz: a44dc906d317e74100463a1ffb18935e91ee7a818727131fa4813f5329cbc0db07f7995d08246d32052239d4a6bae15db8db4de51cfcdb0c3d250b08e341d4ee

data/lib/brick/extensions.rb

@@ -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
@@ -1489,7 +1526,8 @@ end
                            decipher = OpenSSL::Cipher::AES256.new(:CBC).decrypt
                            decipher.iv = "\xB4,\r2\x19\xF5\xFE/\aR\x1A\x8A\xCFV\v\x8C"
                            decipher.key = Digest::SHA256.hexdigest(::Brick.config.license).scan(/../).map { |x| x.hex }.pack('c*')
-                           decipher.update(File.binread("/Users/aga/brick/lib/brick/frameworks/rails/crosstab.brk"))[16..-1]
+                           brick_path = Gem::Specification.find_by_name('brick').gem_dir
+                           decipher.update(File.binread("#{brick_path}/lib/brick/frameworks/rails/crosstab.brk"))[16..-1]
                          else
                            'Crosstab Charting not yet activated -- enter a valid license key in brick.rb'
                          end

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -89,7 +89,7 @@ end
 # is first established), and then automatically creates models, controllers, views,
 # and routes based on those available relations.
 require 'brick/config'
-if Gem::Specification.all_names.any? { |g| g.start_with?('rails-') && g[6..-1] =~ /^([0-9]|\.)+(?:|rc1|beta1)$/ }
+if Gem::Specification.all_names.any? { |g| g.start_with?('rails-') && g[6..-1] =~ /^([0-9]|\.)+(?:|rc1|rc2|beta1)$/ }
   require 'rails'
   require 'brick/frameworks/rails'
 end
@@ -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) ||
@@ -2026,6 +2035,28 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
     end
   end
 
+  # AR >= 5.0 on Ruby >= 3.0
+  ::ActiveRecord::Type::AdapterSpecificRegistry.class_exec do
+    alias :_brick_add_modifier :add_modifier
+    def add_modifier(*args, **kwargs)
+      kwargs.merge!(args.pop) if args.length > 2 && args.last.is_a?(Hash)
+      _brick_add_modifier(*args, **kwargs)
+    end
+  end
+
+  # AR >= 5.0 on Ruby >= 3.0
+  arca = ::ActiveRecord::ConnectionAdapters
+  require 'active_record/connection_adapters/postgresql/column'
+  if arca.const_defined?('PostgreSQLColumn')
+    arca::PostgreSQLColumn.class_exec do
+      alias :_brick_initialize :initialize
+      def initialize(*args, **kwargs)
+        kwargs.merge!(args.pop) if args.last.is_a?(Hash)
+        _brick_initialize(*args, **kwargs)
+      end
+    end
+  end
+
   require 'active_model'
   begin
     require 'active_model/type'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.177
+  version: 1.0.179
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2023-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -165,19 +165,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.42.0
 - !ruby/object:Gem::Dependency
-  name: rswag-ui
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement