brick 1.0.175 → 1.0.177

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 566c62de5deb537568049267ecd415bfb4f22b0343f689a5c4c819a173cc92ba
-  data.tar.gz: aaf90092d67a2669f64ad0ce5484196fefedb3ce666c6977d0b9b66f5fcc8739
+  metadata.gz: 236474c3b0979bffb66ab3561a8fe008ee912ce358dc13556afc2e6e7564fe9a
+  data.tar.gz: d288645dce34156548bd393352591ae1d8eb83a4d1797fa9a2d4150d6e40506d
 SHA512:
-  metadata.gz: 98748d0a02f3d004963652c02d17465406fe586b9ea1bf581f55e9f3fa119d72c3edf323f1934c165059ca0088eb47c7cbe82bf9cba8799bfec83e862dcd13c9
-  data.tar.gz: 916e16bf303120062467e8555ca2845c9ca3e4ed752c0b95094cc556632453ae8dcb66819cb920f101d9da1abf37c57af5ace6282e39a39747f5d117460b8e2d
+  metadata.gz: a8c336750619205c99a76a97414a1315261b0f1498981f3ec7573e73aa759be935357ce7844eb51de4fb905744b3ebe47890fc63005e38fa5f11ce3b009f02c1
+  data.tar.gz: b05c551dc2b483cabdd4b7788c1dc2c8e211803f4d9d1632c69cbe44b2bcf2933f1f39ac4217507fbefe42e0fa680315b3fdcf17b6129108d7811108e7f6f893

data/lib/brick/extensions.rb

@@ -1553,9 +1553,13 @@ class Object
                                                               end))
       end
       hmts = nil
+      if (schema_module || Object).const_defined?((chosen_name = (inheritable_name || model_name)).to_sym)
+        possible = (schema_module || Object).const_get(chosen_name)
+        return possible unless possible == schema_module
+      end
       code = +"class #{full_name} < #{base_model.name}\n"
       built_model = Class.new(base_model) do |new_model_class|
-        (schema_module || Object).const_set((chosen_name = (inheritable_name || model_name)).to_sym, new_model_class)
+        (schema_module || Object).const_set(chosen_name, new_model_class)
         @_brick_relation = relation
         if inheritable_name
           new_model_class.define_singleton_method :inherited do |subclass|
@@ -3100,7 +3104,8 @@ module Brick
         missing << fk[1] unless relations.key?(fk[1])
         missing << primary_table unless is_class || relations.key?(primary_table)
         unless missing.empty?
-          tables = relations.reject { |_k, v| v.fetch(:isView, nil) }.keys.sort
+          tables = relations.reject { |_k, v| v.is_a?(Hash) && v.fetch(:isView, nil) }.keys
+                            .select { |table_name| table_name.is_a?(String) }.sort
           puts "Brick: Additional reference #{fk.inspect} refers to non-existent #{'table'.pluralize(missing.length)} #{missing.join(' and ')}. (Available tables include #{tables.join(', ')}.)"
           return
         end

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 175
+    TINY = 177
 
     # 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]|\.)+$/ }
+if Gem::Specification.all_names.any? { |g| g.start_with?('rails-') && g[6..-1] =~ /^([0-9]|\.)+(?:|rc1|beta1)$/ }
   require 'rails'
   require 'brick/frameworks/rails'
 end

data/lib/generators/brick/migrations_generator.rb

@@ -18,7 +18,7 @@ module Brick
       ::Brick.mode = :on
       ActiveRecord::Base.establish_connection
 
-      if (tables = ::Brick.relations.reject { |k, v| v.key?(:isView) && v[:isView] == true }.map(&:first).sort).empty?
+      if (tables = ::Brick.relations.reject { |k, v| k.is_a?(Symbol) || v.key?(:isView) && v[:isView] == true }.map(&:first).sort).empty?
         puts "No tables found in database #{ActiveRecord::Base.connection.current_database}."
         return
       end

data/lib/generators/brick/models_generator.rb

@@ -28,11 +28,13 @@ module Brick
       existing_models = ActiveRecord::Base.descendants.reject do |m|
         m.abstract_class? || !m.table_exists? || ::Brick.relations.key?(m.table_name)
       end
-      models = ::Brick.relations.keys.map do |tbl|
+      models = ::Brick.relations.keys.each_with_object([]) do |tbl, s|
+        next if tbl.is_a?(Symbol)
+
         tbl_parts = tbl.split('.')
         tbl_parts.shift if [::Brick.default_schema, 'public'].include?(tbl_parts.first)
         tbl_parts[-1] = tbl_parts[-1].singularize
-        tbl_parts.join('/').camelize
+        s << tbl_parts.join('/').camelize
       end - existing_models.map(&:name)
       models.sort! do |a, b| # Sort first to separate namespaced stuff from the rest, then alphabetically
         is_a_namespaced = a.include?('::')

data/lib/generators/brick/seeds_generator.rb

@@ -31,7 +31,7 @@ module Brick
       models = (existing_models.values +
                 # ... then add models which can be auto-built by Brick
                 ::Brick.relations.reject do |k, v|
-                  (v.key?(:isView) && v[:isView] == true) || existing_models.key?(k)
+                  k.is_a?(Symbol) || (v.key?(:isView) && v[:isView] == true) || existing_models.key?(k)
                 end.map { |k, v| SeedModel.new(k, v[:class_name].constantize, true) }
                ).sort { |a, b| a.to_s <=> b.to_s }
       if models.empty?

metadata

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