brick 1.0.66 → 1.0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7e8235e9e499424e41a8329f9056b4ab801fd7502889dfdafc527522f061ad3
-  data.tar.gz: 898b3f172cb9eb6594b382087394857d7ff471a833069bfe7e060f404bfd2d4c
+  metadata.gz: 60ed6bcfecfc09b579a605a6141e06b958d0e274c010432be8b97980833be6fc
+  data.tar.gz: 4ce18cf47d569f61e58cf25d3bd26577fea4932e7171cbcf5cb7756f9d4a8cc5
 SHA512:
-  metadata.gz: 0d0b88ac19a60e25ee48074e5ee67037c41d77b80a54ea22ad1813d22d4e3d233d253ed92a39e317f3faa86aac290ee51e0bed7ab178c583ca1d06b075bfaac1
-  data.tar.gz: a0d8f7683236868789c9262a08a8c615786afdd6ad93b1f330807d5acad5962ea2e2ea645a236e37926b42bfd09db00ec9d00fae15de90da8fe589bfbe493b65
+  metadata.gz: 7691f14a41dad2cea3fcc73f60fc88a57e24ecd8ab1d69575be6b716e43f9ae15eddc6e0e1bd089ba8b3daf7cef2e78ecdaf12a0a86e249ec8f609d00b0a473d
+  data.tar.gz: 237aa7e873db35c6dad6c89c3641c7b9d81016520ddbbc0d1ddfc94576e067adc162c3e8a5f15c983df624e4e3d185d1e1e695a505f7b3a66bda6dd036d91e8c

data/lib/brick/extensions.rb

@@ -657,9 +657,12 @@ Module.class_exec do
                full_class_name = +''
                full_class_name << "::#{self.name}" unless self == Object
                full_class_name << "::#{plural_class_name.underscore.singularize.camelize}"
-               if (plural_class_name == 'BrickSwagger' ||
-                  ((::Brick.config.add_status || ::Brick.config.add_orphans) && plural_class_name == 'BrickGem') ||
-                  model = self.const_get(full_class_name))
+               if plural_class_name == 'BrickSwagger' ||
+                  (
+                    (::Brick.config.add_status || ::Brick.config.add_orphans) &&
+                    plural_class_name == 'BrickGem'
+                  ) ||
+                  model = self.const_get(full_class_name)
                  # if it's a controller and no match or a model doesn't really use the same table name, eager load all models and try to find a model class of the right name.
                  Object.send(:build_controller, self, class_name, plural_class_name, model, relations)
                end
@@ -1033,7 +1036,7 @@ class Object
           self.define_method :orphans do
             instance_variable_set(:@orphans, ::Brick.find_orphans(::Brick.set_db_schema(params)))
           end
-          return [new_controller_class, code + ' # BrickGem controller']
+          return [new_controller_class, code + "end # BrickGem controller\n"]
         when 'BrickSwagger'
           is_swagger = true # if request.format == :json)
         end
@@ -1193,6 +1196,8 @@ class Object
             else
               instance_variable_set("@#{singular_table_name}".to_sym,
                                     model.send(:create, send(params_name_sym)))
+              index
+              render :index
             end
           end
 

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

@@ -96,12 +96,13 @@ module Brick
 
             alias :_brick_find_template :find_template
             def find_template(*args, **options)
-              unless (model_name = (
+              unless (is_status = ::Brick.config.add_status && args[0..1] == ['status', ['brick_gem']]) ||
+                     (is_orphans = ::Brick.config.add_orphans && args[0..1] == ['orphans', ['brick_gem']]) ||
+                     (model_name = (
                        @_brick_model ||
-                       (ActionView.version < ::Gem::Version.new('5.0') && args[1].is_a?(Array) ? set_brick_model(args) : nil)
-                     )&.name) ||
-                     (is_status = ::Brick.config.add_status && args[0..1] == ['status', ['brick_gem']]) ||
-                     (is_orphans = ::Brick.config.add_orphans && args[0..1] == ['orphans', ['brick_gem']])
+                       # Used to also have:  ActionView.version < ::Gem::Version.new('5.0') &&
+                       (args[1].is_a?(Array) ? set_brick_model(args) : nil)
+                     )&.name)
                 return _brick_find_template(*args, **options)
               end
 
@@ -156,7 +157,7 @@ module Brick
                                  end
                     hm_entry << ']'
                     hms_columns << hm_entry
-                  when 'show', 'update'
+                  when 'show', 'new', 'update'
                     hm_stuff << if hm_fk_name
                                   "<%= link_to '#{assoc_name}', #{hm_assoc.klass.name.underscore.tr('/', '_').pluralize}_path({ #{path_keys(hm_assoc, hm_fk_name, "@#{obj_name}", pk)} }) %>\n"
                                 else # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
@@ -179,6 +180,7 @@ module Brick
                               end.keys.sort.each_with_object(+'') do |v, s|
                                 s << "<option value=\"#{v.underscore.gsub('.', '/').pluralize}\">#{v}</option>"
                               end.html_safe
+              table_options << '<option value="brick_status">(Status)</option>'.html_safe
               table_options << '<option value="brick_orphans">(Orphans)</option>'.html_safe if is_orphans
               css = +"<style>
 h1, h3 {
@@ -379,9 +381,10 @@ def display_value(col_type, val)
       '?'
     end
   end
-end %>"
+end
+callbacks = {} %>"
 
-              if ['index', 'show', 'update'].include?(args.first)
+              if ['index', 'show', 'new', 'update'].include?(args.first)
                 poly_cols = []
                 css << "<% bts = { #{
                   bt_items = bts.each_with_object([]) do |v, s|
@@ -537,10 +540,10 @@ if (headerTop) {
 }
 </script>"
 
-              erd_markup = "<div id=\"mermaidErd\" class=\"mermaid\">
+              erd_markup = if @_brick_model
+                             "<div id=\"mermaidErd\" class=\"mermaid\">
 erDiagram
 <% model_short_name = #{@_brick_model.name.split('::').last.inspect}
-   callbacks = {}
    @_brick_bt_descrip&.each do |bt|
      bt_class = bt[1].first.first
      callbacks[bt_name = bt_class.name.split('::').last] = bt_class
@@ -595,6 +598,7 @@ erDiagram
  %>
 </div>
 "
+                           end
               inline = case args.first
                        when 'index'
                          obj_pk = if pk&.is_a?(Array) # Composite primary key?
@@ -890,7 +894,7 @@ erDiagram
 #{script}"
                          end
 
-                       when 'show', 'update'
+                       when 'show', 'new', 'update'
 +"#{css}
 
 <svg id=\"revertTemplate\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"

data/lib/brick/version_number.rb

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

metadata

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