brick 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cd49783dae6701760920fe007cbde7382fd3dbaf5e8f7472d475c0fe8aaf660
-  data.tar.gz: d2330f28e87dde00b1377f6cbca31cbbfe2dd3b2c495f1fbd0aebc0f8a951504
+  metadata.gz: 634669de2074746d62642b8c9108070b78e92b14f7924ac969404b240de2267d
+  data.tar.gz: 7614fa456fcaeb6bc68227230088fe3adeed31278241a000f3fb19792b763d26
 SHA512:
-  metadata.gz: 2a3c7ba47d32f3a6ab6c9be838006826f5266efb1349d90ce7d53b5e8f89ea078bdcb699a7db8084176e2de444a27931ce8e0216af666c25704c0568b59ac827
-  data.tar.gz: 41fccf3387315cd54fd596955c3f07760941cd4aa51959dc99f87d0b6fb38de742ad11fe7dabb084a3e72167c340b8aafce838c7704626359ccb41878e202ae2
+  metadata.gz: 3b89ed9c8ffe3c63e098a3f7a8e5a9987db0c00bfe2c917b7c2acefebc30653a4a88d091852b8f8e6128daa310e7c7742d10611acfb0ffe7d06cc6c01da7068e
+  data.tar.gz: 98d58b4461b9e85537da640e3940316553d142a341547086ce614f75d9366145c8818beb6e972ac93a77e7209b034eb64a64eb9a078f6afb91fbbd008e3ade69

data/lib/brick/extensions.rb

@@ -80,6 +80,18 @@ module ActiveRecord
       end
     end
   end
+
+  module Inheritance
+    module ClassMethods
+      private
+
+      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)
+      end
+    end
+  end
 end
 
 # Object.class_exec do
@@ -113,6 +125,11 @@ class Object
         singular_table_name = ActiveSupport::Inflector.underscore(model_name)
         table_name = ActiveSupport::Inflector.pluralize(singular_table_name)
 
+        # Adjust for STI if we know of a base model for the requested model name
+        if (base_model = ::Brick.sti_models[model_name]&.fetch(:base, nil))
+          table_name = base_model.table_name
+        end
+
         # Maybe, just maybe there's a database table that will satisfy this need
         if (matching = [table_name, singular_table_name, plural_class_name, model_name].find { |m| relations.key?(m) })
           build_model(model_name, singular_table_name, table_name, relations, matching)
@@ -138,8 +155,9 @@ class Object
       if table_name == singular_table_name && !ActiveSupport::Inflector.inflections.uncountable.include?(table_name)
         raise NameError.new("Class name for a model that references table \"#{matching}\" should be \"#{ActiveSupport::Inflector.singularize(model_name)}\".")
       end
-      code = +"class #{model_name} < ActiveRecord::Base\n"
-      built_model = Class.new(ActiveRecord::Base) do |new_model_class|
+      base_model = ::Brick.sti_models[model_name]&.fetch(:base, nil) || ActiveRecord::Base
+      code = +"class #{model_name} < #{base_model.name}\n"
+      built_model = Class.new(base_model) do |new_model_class|
         Object.const_set(model_name.to_sym, new_model_class)
         # Accommodate singular or camel-cased table names such as "order_detail" or "OrderDetails"
         code << "  self.table_name = '#{self.table_name = matching}'\n" unless table_name == matching

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

@@ -66,7 +66,7 @@ module Brick
                 associatives = hms.select { |k, v| v.options[:through] }.each_with_object({}) do |hmt, s|
                   s[hmt.first] = hms.delete(hmt.last.options[:through]) # End up with a hash of HMT names pointing to join-table associations
                 end
-                hms_headers = hms.each_with_object(+'') { |hm, s| s << "<th>HM#{'T' if hm.last.options[:through]} #{hm.first}</th>\n" }
+                hms_headers = hms.each_with_object(+'') { |hm, s| s << "<th>H#{hm.last.macro == :has_one ? 'O' : 'M'}#{'T' if hm.last.options[:through]} #{hm.first}</th>\n" }
                 hms_columns = hms.each_with_object(+'') do |hm, s|
                   hm_fk_name = if hm.last.options[:through]
                     associative = associatives[hm.last.name]
@@ -74,9 +74,15 @@ module Brick
                   else
                     hm.last.foreign_key
                   end
-                  s << "<td>
+                  s << if hm.last.macro == :has_many
+"<td>
   <%= link_to \"#\{#{obj_name}.#{hm.first}.count\} #{hm.first}\", #{hm.last.klass.name.underscore.pluralize}_path({ #{hm_fk_name}: #{obj_name}.#{pk} }) unless #{obj_name}.#{hm.first}.count.zero? %>
 </td>\n"
+                         else # has_one
+"<td>
+  <%= obj = #{obj_name}.#{hm.first}; link_to(obj.brick_descrip, obj) if obj %>
+</td>\n"
+                       end
                 end
 
                 inline = case args.first
@@ -89,7 +95,7 @@ module Brick
 <table id=\"#{table_name}\">
   <tr>
   <% is_first = true; is_need_id_col = nil
-     bts = { #{bts.each_with_object([]) { |v, s| s << "#{v.first.inspect} => [#{v.last.first.inspect}, #{v.last.last.name}, #{v.last.last.primary_key.inspect}]"}.join(', ')} }
+     bts = { #{bts.each_with_object([]) { |v, s| s << "#{v.first.inspect} => [#{v.last.first.inspect}, #{v.last[1].name}, #{v.last[1].primary_key.inspect}]"}.join(', ')} }
      @#{table_name}.columns.map(&:name).each do |col| %>
     <% next if col == '#{pk}' || ::Brick.config.metadata_columns.include?(col) %>
     <th>
@@ -125,9 +131,9 @@ module Brick
       <% next if k == '#{pk}' || ::Brick.config.metadata_columns.include?(k) %>
       <td>
       <% if (bt = bts[k]) %>
-        <%= obj = bt[1].find_by(bt.last => val); link_to obj.brick_descrip, obj %>
+        <%= obj = bt[1].find_by(bt.last => val); link_to(obj.brick_descrip, obj) if obj %>
       <% elsif is_first %>
-        <%= is_first = false; link_to val, #{obj_name} %>
+        <%= is_first = false; link_to val, #{obj_name}_path(#{obj_name}.#{pk}) %>
       <% else %>
         <%= val %>
       <% end %>

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -81,6 +81,10 @@ if Gem::Specification.all_names.any? { |g| g.start_with?('rails-') }
   require 'brick/frameworks/rails'
 end
 module Brick
+  def self.sti_models
+    @sti_models ||= {}
+  end
+
   class << self
     # All tables and views (what Postgres calls "relations" including column and foreign key info)
     def relations
@@ -107,7 +111,7 @@ module Brick
           end
 
           s.first[a.foreign_key] = [a.name, a.klass]
-        when :has_many
+        when :has_many, :has_one
           s.last[a.name] = a
         end
         s

metadata

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