brick 1.0.10 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfc0c2e81700a407de1fe154d337dd83d756a29fba0914db5eeb1974198720d2
-  data.tar.gz: 0051e6b4fe55d1e9f4cc4614aabd941a6947f66af5ac41f35725df594217fd2d
+  metadata.gz: 2c22e9b6dcc1ca819d7cdc6852def21d10e5c5c23f6fc7489b1fe5ae52b6c68e
+  data.tar.gz: 2242f7c0045e294fc505a479054a43d7d4355a0f7b6bf8407122f6f426eea541
 SHA512:
-  metadata.gz: 445acf196541b17429bb7c5f93b64ebd51cc4c3b1fcc4cec7fcb43cca6e47ed86a027bc0010b3053a763414809a390509d9da9c296c4eab85bbd794a3553ba90
-  data.tar.gz: 110cd25429c21410effe398a61c4284876d49e222267987e0c5e0e09b5ab8e84bd4991fbd36257077f5178fa3fcba661970162e574744c2f8d2b80ec4a1e2d51
+  metadata.gz: 6b42dcae433ac8c0fbc91dbf9952451548af6e72eadb466f98c8c6d084be7217df192aa6fc141a18d1e76bd25a551746cf155799045d66f88f41ede99b36b39e
+  data.tar.gz: 7ab155441e2868af3fe0b2a5339ec6614c18ff9d641a076f678ef6baa7b943cad88c97443db3c70506206c54f2b754a1892490d977f3e714fb66c889fe107fa5

data/lib/brick/config.rb

@@ -84,7 +84,7 @@ module Brick
     end
 
     def model_descrips
-      @mutex.synchronize { @model_descrips }
+      @mutex.synchronize { @model_descrips ||= {} }
     end
 
     def model_descrips=(descrips)

data/lib/brick/extensions.rb

@@ -137,7 +137,26 @@ module ActiveRecord
       alias _brick_find_sti_class find_sti_class
       def find_sti_class(type_name)
         ::Brick.sti_models[type_name] = { base: self } unless type_name.blank?
-        _brick_find_sti_class(type_name)
+        module_prefixes = type_name.split('::')
+        module_prefixes.unshift('') unless module_prefixes.first.blank?
+        candidate_file = Rails.root.join('app/models' + module_prefixes.map(&:underscore).join('/') + '.rb')
+        if File.exists?(candidate_file)
+          # Find this STI class normally
+          _brick_find_sti_class(type_name)
+        else
+          # Build missing prefix modules if they don't yet exist
+          this_module = Object
+          module_prefixes[1..-2].each do |module_name|
+            mod = if this_module.const_defined?(module_name)
+                    this_module.const_get(module_name)
+                  else
+                    this_module.const_set(module_name.to_sym, Module.new)
+                  end
+          end
+          # Build missing prefix modules if they don't yet exist
+          this_module.const_set(module_prefixes.last.to_sym, klass = Class.new(self))
+          klass
+        end
       end
     end
   end
@@ -161,7 +180,8 @@ class Object
       return Object._brick_const_missing(*args) if ActiveSupport::Dependencies.search_for_file(class_name.underscore)
 
       relations = ::Brick.instance_variable_get(:@relations)[ActiveRecord::Base.connection_pool.object_id] || {}
-      result = if ::Brick.enable_controllers? && class_name.end_with?('Controller') && (plural_class_name = class_name[0..-11]).length.positive?
+      is_controllers_enabled = ::Brick.enable_controllers? || (ENV['RAILS_ENV'] || ENV['RACK_ENV'])  == 'development'
+      result = if is_controllers_enabled && class_name.end_with?('Controller') && (plural_class_name = class_name[0..-11]).length.positive?
         # Otherwise now it's up to us to fill in the gaps
         if (model = ActiveSupport::Inflector.singularize(plural_class_name).constantize)
           # 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.
@@ -382,7 +402,6 @@ class Object
     end
 
     def _brick_get_hm_assoc_name(relation, hm_assoc)
-      binding.pry if hm_assoc.nil?
       if relation[:hm_counts][hm_assoc[:assoc_name]]&.> 1
         [ActiveSupport::Inflector.pluralize(hm_assoc[:alternate_name]), true]
       else
@@ -532,10 +551,12 @@ module ActiveRecord::ConnectionHandling
       end
     end
 
-    puts "Classes that can be built from tables:"
+    puts "\nClasses that can be built from tables:"
     relations.select { |_k, v| !v.key?(:isView) }.keys.each { |k| puts ActiveSupport::Inflector.singularize(k).camelize }
-    puts "Classes that can be built from views:"
-    relations.select { |_k, v| v.key?(:isView) }.keys.each { |k| puts ActiveSupport::Inflector.singularize(k).camelize }
+    unless (views = relations.select { |_k, v| v.key?(:isView) }).empty?
+      puts "\nClasses that can be built from views:"
+      views.keys.each { |k| puts ActiveSupport::Inflector.singularize(k).camelize }
+    end
     # pp relations; nil
 
     # relations.keys.each { |k| ActiveSupport::Inflector.singularize(k).camelize.constantize }

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

@@ -8,9 +8,9 @@ module Brick
       config.brick = ActiveSupport::OrderedOptions.new
       ActiveSupport.on_load(:before_initialize) do |app|
         ::Brick.enable_models = app.config.brick.fetch(:enable_models, true)
-        ::Brick.enable_controllers = app.config.brick.fetch(:enable_controllers, true)
-        ::Brick.enable_views = app.config.brick.fetch(:enable_views, true)
-        ::Brick.enable_routes = app.config.brick.fetch(:enable_routes, true)
+        ::Brick.enable_controllers = app.config.brick.fetch(:enable_controllers, false)
+        ::Brick.enable_views = app.config.brick.fetch(:enable_views, false)
+        ::Brick.enable_routes = app.config.brick.fetch(:enable_routes, false)
         ::Brick.skip_database_views = app.config.brick.fetch(:skip_database_views, false)
 
         # Specific database tables and views to omit when auto-creating models
@@ -37,7 +37,7 @@ module Brick
         # ====================================
         # Dynamically create generic templates
         # ====================================
-        if ::Brick.enable_views?
+        if ::Brick.enable_views? || (ENV['RAILS_ENV'] || ENV['RACK_ENV'])  == 'development'
           ActionView::LookupContext.class_exec do
             alias :_brick_template_exists? :template_exists?
             def template_exists?(*args, **options)
@@ -209,7 +209,11 @@ function changeout(href, param, value) {
       <% next if k == '#{pk}' || ::Brick.config.metadata_columns.include?(k) %>
       <td>
       <% if (bt = bts[k]) %>
-        <%= bt_obj = bt[1].find_by(bt.last => val); link_to(bt_obj.brick_descrip, bt_obj) if bt_obj %>
+        <%# Instead of just 'bt_obj we have to put in all of this junk:
+        # send(\"#\{bt_obj_class = bt[1].name.underscore\}_path\".to_sym, bt_obj.send(bt[1].primary_key.to_sym))
+        # Otherwise we get stuff like:
+        # ActionView::Template::Error (undefined method `vehicle_path' for #<ActionView::Base:0x0000000033a888>) %>
+        <%= bt_obj = bt[1].find_by(bt.last => val); link_to(bt_obj.brick_descrip, send(\"#\{bt_obj_class = bt[1].name.underscore\}_path\".to_sym, bt_obj.send(bt[1].primary_key.to_sym))) if bt_obj %>
       <% else %>
         <%= val %>
       <% end %>
@@ -244,7 +248,7 @@ function changeout(href, param, value) {
     </th>
     <td>
     <% if (bt = bts[k]) %>
-      <%= bt_obj = bt[1].find_by(bt.last => val); link_to(bt_obj.brick_descrip, bt_obj) if bt_obj %>
+      <%= bt_obj = bt[1].find_by(bt.last => val); link_to(bt_obj.brick_descrip, send(\"#\{bt_obj_class = bt[1].name.underscore\}_path\".to_sym, bt_obj.send(bt[1].primary_key.to_sym))) if bt_obj %>
     <% else %>
       <%= val %>
     <% end %>
@@ -279,7 +283,7 @@ function changeout(href, param, value) {
           end
         end
 
-        if ::Brick.enable_routes?
+        if ::Brick.enable_routes? || (ENV['RAILS_ENV'] || ENV['RACK_ENV'])  == 'development'
           ActionDispatch::Routing::RouteSet.class_exec do
             alias _brick_finalize_routeset! finalize!
             def finalize!(*args, **options)

data/lib/brick/version_number.rb

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

data/lib/generators/brick/install_generator.rb

@@ -80,11 +80,13 @@ module Brick
 # # Settings for the Brick gem
 # # (By default this auto-creates models, controllers, views, and routes on-the-fly.)
 
-# # Normally these all start out as being enabled, but can be selectively disabled:
-# Brick.enable_routes = false
+# # Normally all are enabled in development mode, and for security reasons only models are enabled in production
+# # and test.  This allows you to either (a) turn off models entirely, or (b) enable controllers, views, and routes
+# # in production.
+# Brick.enable_routes = true # Setting this to \"false\" will disable routes in development
 # Brick.enable_models = false
-# Brick.enable_controllers = false
-# Brick.enable_views = false
+# Brick.enable_controllers = true # Setting this to \"false\" will disable controllers in development
+# Brick.enable_views = true # Setting this to \"false\" will disable views in development
 
 # # By default models are auto-created for database views, and set to be read-only.  This can be skipped.
 # Brick.skip_database_views = true
@@ -124,7 +126,7 @@ module Brick
 # # part of a has_many :through association.)  If you want to use different exclusion columns than our defaults
 # # then this setting resets that list.  For instance, here is an override that is useful in the Sakila sample
 # # database:
-# Brick.metadata_columns = ['last_updated']
+# Brick.metadata_columns = ['last_update']
 
 # # A simple DSL is available to allow more user-friendly display of objects.  Normally a user object might be shown
 # # as its first non-metadata column, or if that is not available then something like \"User #45\" where 45 is that

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.13
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord