brick 1.0.26 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 922a55ec392e2ea9cef11c7297e4c2e4883e918130a23e49102b5a7e2442140e
-  data.tar.gz: 7cda213ec2e7cdccae096ef4ad8091a53a91359a1e6fabeb753cc2b579ac5c16
+  metadata.gz: '097fb194c2b1323cd051669f362d86492d9c768f1cbccf06c2fdc45a7f266e1e'
+  data.tar.gz: 72746f153d073256b8be063e90c28da85a50e11865250f2570d501ff320431b3
 SHA512:
-  metadata.gz: 7b817257f9c2aedd47bc2471b12e13edc8b370b71920258755f0f9a7594060e065d022e8d4b2b360cdc41f2a60def02cfc406889d526d80088670bd64acd58be
-  data.tar.gz: 1ea923301103dcc53853940770861ab5c2635f1280026e0740287274c0e9bb7d566ddcf96db0d3858467b788bc9ee4b73e7bcfc61145be1bbb43775cfb859b80
+  metadata.gz: 83d0c40c0af17d314d6b4cd7ab0e312bce1c8d57bdd0992da1b54fa8a3e829852c6fd800c34f3bd35f3a3306bda736dc99d14af19009926bf65971a5d4904717
+  data.tar.gz: c82b9c31ffe3a00e701e22a3f69c85e7b60e0b3b6d24e95df7fe3f8afb85b00ab7515e0befab7dd37e8a25924274e663127b953dab8eb64041d834aa39de4bc1

data/lib/brick/config.rb

@@ -130,6 +130,14 @@ module Brick
       @mutex.synchronize { @schema_to_analyse = schema }
     end
 
+    def default_route_fallback
+      @mutex.synchronize { @default_route_fallback }
+    end
+
+    def default_route_fallback=(resource_name)
+      @mutex.synchronize { @default_route_fallback = resource_name }
+    end
+
     def skip_database_views
       @mutex.synchronize { @skip_database_views }
     end

data/lib/brick/extensions.rb

@@ -385,7 +385,8 @@ module ActiveRecord
                        else
                          fk_col = hm.foreign_key
                          poly_type = hm.inverse_of.foreign_type if hm.options.key?(:as)
-                         hm.klass.primary_key || '*'
+                         pk = hm.klass.primary_key
+                         (pk.is_a?(Array) ? pk.first : pk) || '*'
                        end
         tbl_alias = "_br_#{hm.name}"
         pri_tbl = hm.active_record
@@ -779,11 +780,15 @@ class Object
 
         if model.primary_key
           code << "  def show\n"
-          code << (find_by_id = "    @#{singular_table_name} = #{model.name}.find(params[:id].split(','))\n")
+          code << (find_by_id = "    id = params[:id]&.split(/[\\/,_]/)
+    id = id.first if id.is_a?(Array) && id.length == 1
+    @#{singular_table_name} = #{model.name}.find(id)\n")
           code << "  end\n"
           self.define_method :show do
             ::Brick.set_db_schema(params)
-            instance_variable_set("@#{singular_table_name}".to_sym, model.find(params[:id].split(',')))
+            id = params[:id]&.split(/[\/,_]/)
+            id = id.first if id.is_a?(Array) && id.length == 1
+            instance_variable_set("@#{singular_table_name}".to_sym, model.find(id))
           end
         end
 

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

@@ -112,7 +112,7 @@ module Brick
 "<%= obj = #{obj_name}.#{hm.first}; link_to(obj.brick_descrip, obj) if obj %>\n"
                                  end
                 elsif args.first == 'show'
-                  hm_stuff << "<%= link_to '#{assoc_name}', #{hm_assoc.klass.name.underscore.pluralize}_path({ #{path_keys(hm_assoc, hm_fk_name, "@#{obj_name}&.first&", pk)} }) %>\n"
+                  hm_stuff << "<%= link_to '#{assoc_name}', #{hm_assoc.klass.name.underscore.pluralize}_path({ #{path_keys(hm_assoc, hm_fk_name, "@#{obj_name}", pk)} }) %>\n"
                 end
                 s << hm_stuff
               end
@@ -444,7 +444,7 @@ function changeout(href, param, value) {
 <p style=\"color: green\"><%= notice %></p>#{"
 <select id=\"schema\">#{schema_options}</select>" if ::Brick.db_schemas.length > 1}
 <select id=\"tbl\">#{table_options}</select>
-<h1>#{model_name}: <%= (obj = @#{obj_name}&.first)&.brick_descrip || controller_name %></h1>
+<h1>#{model_name}: <%= (obj = @#{obj_name})&.brick_descrip || controller_name %></h1>
 <%= link_to '(See all #{obj_name.pluralize})', #{table_name}_path %>
 <% if obj %>
   <%= # path_options = [obj.#{pk}]
@@ -453,7 +453,7 @@ function changeout(href, param, value) {
     form_for(obj.becomes(#{model_name})) do |f| %>
   <table>
   <% has_fields = false
-    @#{obj_name}.first.attributes.each do |k, val| %>
+    @#{obj_name}.attributes.each do |k, val| %>
     <tr>
     <%# %%% Accommodate composite keys %>
     <% next if k == '#{pk}' || ::Brick.config.metadata_columns.include?(k) %>
@@ -464,10 +464,15 @@ function changeout(href, param, value) {
         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 = @#{obj_name}.first.send(\"#\{bt.first\}_type\")
-          bt_pair = bt[1].find { |pair| pair.first.name == poly_class_name }
+          poly_class_name = @#{obj_name}.send(\"#\{bt.first\}_type\")
+          bt_pair = nil
+          loop do
+            bt_pair = bt[1].find { |pair| pair.first.name == poly_class_name }
+            # Acxommodate 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
           # descrips = @_brick_bt_descrip[bt.first][bt_class]
-          poly_id = @#{obj_name}.first.send(\"#\{bt.first\}_id\")
+          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)] }
         else # No polymorphism, so just get the first one
           bt_pair = bt[1].first
@@ -520,16 +525,17 @@ function changeout(href, param, value) {
 
   #{hms_headers.each_with_object(+'') do |hm, s|
     if (pk = hm.first.klass.primary_key)
-      s << "<table id=\"#{hm_name = hm.first.name.to_s}\">
+      hm_singular_name = (hm_name = hm.first.name.to_s).singularize.underscore
+      obj_pk = (pk.is_a?(Array) ? pk : [pk]).each_with_object([]) { |pk_part, s| s << "#{hm_singular_name}.#{pk_part}" }.join(', ')
+      s << "<table id=\"#{hm_name}\">
         <tr><th>#{hm[3]}</th></tr>
-        <% collection = @#{obj_name}.first.#{hm_name}
+        <% collection = @#{obj_name}.#{hm_name}
         collection = collection.is_a?(ActiveRecord::Associations::CollectionProxy) ? collection.order(#{pk.inspect}) : [collection]
         if collection.empty? %>
           <tr><td>(none)</td></tr>
         <% else %>
-          <% collection.uniq.each do |#{hm_singular_name = hm_name.singularize.underscore}| %>
-            <%# %%% accommodate composite primary key %>
-            <tr><td><%= link_to(#{hm_singular_name}.brick_descrip, #{hm.first.klass.name.underscore}_path(#{hm_singular_name}.#{pk})) %></td></tr>
+          <% collection.uniq.each do |#{hm_singular_name}| %>
+            <tr><td><%= link_to(#{hm_singular_name}.brick_descrip, #{hm.first.klass.name.underscore}_path([#{obj_pk}])) %></td></tr>
           <% end %>
         <% end %>
       </table>"

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -291,6 +291,10 @@ module Brick
       Brick.config.schema_to_analyse = schema
     end
 
+    def default_route_fallback=(resource_name)
+      Brick.config.default_route_fallback = resource_name
+    end
+
     # Load additional references (virtual foreign keys)
     # This is attempted early if a brick initialiser file is found, and then again as a failsafe at the end of our engine's initialisation
     # %%% Maybe look for differences the second time 'round and just add new stuff instead of entirely deferring
@@ -381,6 +385,9 @@ In config/initializers/brick.rb appropriate entries would look something like:
     def finalize!
       existing_controllers = routes.each_with_object({}) { |r, s| c = r.defaults[:controller]; s[c] = nil if c }
       ::Rails.application.routes.append do
+        unless ::Brick.config.default_route_fallback.blank? || ::Rails.application.routes.named_routes.send(:routes)[:root]
+          send(:root, "#{::Brick.config.default_route_fallback}#index")
+        end
         # %%% TODO: If no auto-controllers then enumerate the controllers folder in order to build matching routes
         # If auto-controllers and auto-models are both enabled then this makes sense:
         ::Brick.relations.each do |k, v|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.0.27
 platform: ruby
 authors:
 - Lorin Thwaits