brick 1.0.176 → 1.0.177

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 281b8aaa57a588877d66c995c0c0ec718a73c6b1cfdfc733bed25df2e7bdea8b
4
- data.tar.gz: f314b8580a2a45f501f8f64f23f35225571cc299f96d1cc89c6da7ecf55de523
3
+ metadata.gz: 236474c3b0979bffb66ab3561a8fe008ee912ce358dc13556afc2e6e7564fe9a
4
+ data.tar.gz: d288645dce34156548bd393352591ae1d8eb83a4d1797fa9a2d4150d6e40506d
5
5
  SHA512:
6
- metadata.gz: 0ad317de582d86e0b67fc4396fa3b1dab9a018fa101b7bd3265157783ebb714a936b8593086d9a749dfc54654009dc921c0f4c32476a2bcee29138a281ecb03b
7
- data.tar.gz: 117990ba8e3d7a8d3dea3e7f2394ab063b6d30b224cb96b70f6c758945fb062ce398249a4107767e78088251e444c55fbd71f1df8bd0ee73a77de40574661041
6
+ metadata.gz: a8c336750619205c99a76a97414a1315261b0f1498981f3ec7573e73aa759be935357ce7844eb51de4fb905744b3ebe47890fc63005e38fa5f11ce3b009f02c1
7
+ data.tar.gz: b05c551dc2b483cabdd4b7788c1dc2c8e211803f4d9d1632c69cbe44b2bcf2933f1f39ac4217507fbefe42e0fa680315b3fdcf17b6129108d7811108e7f6f893
@@ -1553,9 +1553,13 @@ class Object
1553
1553
  end))
1554
1554
  end
1555
1555
  hmts = nil
1556
+ if (schema_module || Object).const_defined?((chosen_name = (inheritable_name || model_name)).to_sym)
1557
+ possible = (schema_module || Object).const_get(chosen_name)
1558
+ return possible unless possible == schema_module
1559
+ end
1556
1560
  code = +"class #{full_name} < #{base_model.name}\n"
1557
1561
  built_model = Class.new(base_model) do |new_model_class|
1558
- (schema_module || Object).const_set((chosen_name = (inheritable_name || model_name)).to_sym, new_model_class)
1562
+ (schema_module || Object).const_set(chosen_name, new_model_class)
1559
1563
  @_brick_relation = relation
1560
1564
  if inheritable_name
1561
1565
  new_model_class.define_singleton_method :inherited do |subclass|
@@ -3100,7 +3104,8 @@ module Brick
3100
3104
  missing << fk[1] unless relations.key?(fk[1])
3101
3105
  missing << primary_table unless is_class || relations.key?(primary_table)
3102
3106
  unless missing.empty?
3103
- tables = relations.reject { |_k, v| v.fetch(:isView, nil) }.keys.sort
3107
+ tables = relations.reject { |_k, v| v.is_a?(Hash) && v.fetch(:isView, nil) }.keys
3108
+ .select { |table_name| table_name.is_a?(String) }.sort
3104
3109
  puts "Brick: Additional reference #{fk.inspect} refers to non-existent #{'table'.pluralize(missing.length)} #{missing.join(' and ')}. (Available tables include #{tables.join(', ')}.)"
3105
3110
  return
3106
3111
  end
@@ -5,7 +5,7 @@ module Brick
5
5
  module VERSION
6
6
  MAJOR = 1
7
7
  MINOR = 0
8
- TINY = 176
8
+ TINY = 177
9
9
 
10
10
  # PRE is nil unless it's a pre-release (beta, RC, etc.)
11
11
  PRE = nil
data/lib/brick.rb CHANGED
@@ -89,7 +89,7 @@ end
89
89
  # is first established), and then automatically creates models, controllers, views,
90
90
  # and routes based on those available relations.
91
91
  require 'brick/config'
92
- if Gem::Specification.all_names.any? { |g| g.start_with?('rails-') && g[6..-1] =~ /^([0-9]|\.)+$/ }
92
+ if Gem::Specification.all_names.any? { |g| g.start_with?('rails-') && g[6..-1] =~ /^([0-9]|\.)+(?:|rc1|beta1)$/ }
93
93
  require 'rails'
94
94
  require 'brick/frameworks/rails'
95
95
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: brick
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.176
4
+ version: 1.0.177
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lorin Thwaits
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-09-17 00:00:00.000000000 Z
11
+ date: 2023-09-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord
@@ -178,20 +178,6 @@ dependencies:
178
178
  - - ">="
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
- - !ruby/object:Gem::Dependency
182
- name: mysql2
183
- requirement: !ruby/object:Gem::Requirement
184
- requirements:
185
- - - "~>"
186
- - !ruby/object:Gem::Version
187
- version: '0.5'
188
- type: :development
189
- prerelease: false
190
- version_requirements: !ruby/object:Gem::Requirement
191
- requirements:
192
- - - "~>"
193
- - !ruby/object:Gem::Version
194
- version: '0.5'
195
181
  - !ruby/object:Gem::Dependency
196
182
  name: pg
197
183
  requirement: !ruby/object:Gem::Requirement